From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 12864 invoked by alias); 11 Jul 2006 14:31:14 -0000 Received: (qmail 12855 invoked by uid 22791); 11 Jul 2006 14:31:13 -0000 X-Spam-Check-By: sourceware.org Received: from bender.bawue.de (HELO bender.bawue.de) (193.7.176.20) by sourceware.org (qpsmtpd/0.31) with ESMTP; Tue, 11 Jul 2006 14:31:07 +0000 Received: from lagash (mipsfw.mips-uk.com [194.74.144.146]) (using TLSv1 with cipher DES-CBC3-SHA (168/168 bits)) (No client certificate requested) by bender.bawue.de (Postfix) with ESMTP id EF53E44D2A for ; Tue, 11 Jul 2006 16:31:03 +0200 (MEST) Received: from ths by lagash with local (Exim 4.62) (envelope-from ) id 1G0JGF-00019Q-5Z for sid@sources.redhat.com; Tue, 11 Jul 2006 15:30:51 +0100 Date: Tue, 11 Jul 2006 14:31:00 -0000 To: sid@sources.redhat.com Subject: [PATCH] Fix bochs build failure with g++ 4.1 Message-ID: <20060711143050.GB1622@networkno.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.11+cvs20060403 From: Thiemo Seufer Mailing-List: contact sid-help@sourceware.org; run by ezmlm Precedence: bulk List-Subscribe: List-Archive: List-Post: List-Help: , Sender: sid-owner@sourceware.org X-SW-Source: 2006-q3/txt/msg00002.txt.bz2 Hello All, the appended patch fixes a build failure with g++ 4.1. Thiemo 2006-07-11 Thiemo Seufer * cpu/sid-x86-cpu-wrapper.h, cpu/sid-x86-cpu-wrapper.h (get_pc): Implement function. Index: sid/component/bochs/cpu/sid-x86-cpu-wrapper.cc =================================================================== RCS file: /cvs/src/src/sid/component/bochs/cpu/sid-x86-cpu-wrapper.cc,v retrieving revision 1.2 diff -u -p -r1.2 sid-x86-cpu-wrapper.cc --- sid/component/bochs/cpu/sid-x86-cpu-wrapper.cc 4 Mar 2002 23:33:01 -0000 1.2 +++ sid/component/bochs/cpu/sid-x86-cpu-wrapper.cc 11 Jul 2006 12:51:58 -0000 @@ -167,6 +167,12 @@ x86_cpu::set_pc (sid::host_int_4 value) bx_cpu.eip = value - bx_cpu.sregs[BX_SEG_REG_CS].cache.u.segment.base; } +sid::host_int_4 +x86_cpu::get_pc (void) +{ + return bx_cpu.eip; +} + string x86_cpu::dbg_get_reg(unsigned int reg) { Index: sid/component/bochs/cpu/sid-x86-cpu-wrapper.h =================================================================== RCS file: /cvs/src/src/sid/component/bochs/cpu/sid-x86-cpu-wrapper.h,v retrieving revision 1.2 diff -u -p -r1.2 sid-x86-cpu-wrapper.h --- sid/component/bochs/cpu/sid-x86-cpu-wrapper.h 4 Mar 2002 23:33:01 -0000 1.2 +++ sid/component/bochs/cpu/sid-x86-cpu-wrapper.h 11 Jul 2006 12:51:59 -0000 @@ -66,6 +66,7 @@ public: void reset (); void flush_icache (); void set_pc (sid::host_int_4 value); + sid::host_int_4 get_pc (void); string dbg_get_reg(unsigned int); component::status dbg_set_reg(unsigned int, const string &);