[prev in list] [next in list] [prev in thread] [next in thread] 

List:       bochs-cvs
Subject:    [Bochs-cvs] CVS: bochs/cpu cpu.cc, 1.164, 1.165 cpu.h, 1.300,
From:       Stanislav Shwartsman <sshwarts () users ! sourceforge ! net>
Date:       2006-06-25 21:44:48
Message-ID: E1FucPQ-0007q6-Sh () sc8-pr-cvs3 ! sourceforge ! net
[Download RAW message or body]

Update of /cvsroot/bochs/bochs/cpu
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv30037/cpu

Modified Files:
	cpu.cc cpu.h extdb.cc extdb.h soft_int.cc 
Log Message:
Fixed compilation error of extdb


Index: cpu.cc
===================================================================
RCS file: /cvsroot/bochs/bochs/cpu/cpu.cc,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -d -r1.164 -r1.165
--- cpu.cc	24 Jun 2006 18:27:11 -0000	1.164
+++ cpu.cc	25 Jun 2006 21:44:46 -0000	1.165
@@ -259,7 +259,6 @@
 
     // fetch and decode next instruction
     bxInstruction_c *i = fetchInstruction(&iStorage, eipBiased);
-    bx_address next_RIP = RIP + i->ilen();
     BxExecutePtr_tR resolveModRM = i->ResolveModrm; // Get as soon as possible for speculation
     BxExecutePtr_t execute = i->execute; // fetch as soon as possible for speculation
     if (resolveModRM)
@@ -274,7 +273,7 @@
 #endif
 
 #if BX_EXTERNAL_DEBUGGER
-    if (regs.debug_state != debug_run) bx_external_debugger(BX_CPU_THIS);
+    bx_external_debugger(BX_CPU_THIS);
 #endif
 
 #if BX_DISASM
@@ -290,7 +289,7 @@
 
     // decoding instruction compeleted -> continue with execution
     BX_INSTR_BEFORE_EXECUTION(BX_CPU_ID, i);
-    RIP = next_RIP;
+    RIP += i->ilen();
 
     if ( !(i->repUsedL() && i->repeatableL()) ) {
       // non repeating instruction
@@ -780,7 +779,6 @@
 }
 
 #if BX_EXTERNAL_DEBUGGER
-
 void BX_CPU_C::ask(int level, const char *prefix, const char *fmt, va_list ap)
 {
   char buf1[1024];
@@ -788,16 +786,7 @@
   printf ("%s %s\n", prefix, buf1);
   trap_debugger(1);
 }
-
-void BX_CPU_C::trap_debugger(bx_bool callnow)
-{
-  regs.debug_state = debug_step;
-  if (callnow) {
-    bx_external_debugger(BX_CPU_THIS);
-  }
-}
-
-#endif  // #if BX_EXTERNAL_DEBUGGER
+#endif
 
 #if BX_DEBUGGER
 extern unsigned dbg_show_mask;
@@ -975,7 +964,7 @@
 
 void BX_CPU_C::dbg_force_interrupt(unsigned vector)
 {
-  // Used to force slave simulator to take an interrupt, without
+  // Used to force simulator to take an interrupt, without
   // regard to IF
 
   if (setjmp(BX_CPU_THIS_PTR jmp_buf_env) == 0) {

Index: cpu.h
===================================================================
RCS file: /cvsroot/bochs/bochs/cpu/cpu.h,v
retrieving revision 1.300
retrieving revision 1.301
diff -u -d -r1.300 -r1.301
--- cpu.h	17 Jun 2006 12:09:55 -0000	1.300
+++ cpu.h	25 Jun 2006 21:44:46 -0000	1.301
@@ -1236,7 +1236,7 @@
   } address_xlation;
 
 #if BX_EXTERNAL_DEBUGGER
-  virtual void ask (int level, const char *prefix, const char *fmt, va_list ap);
+  virtual void ask(int level, const char *prefix, const char *fmt, va_list ap);
 #endif
 
   BX_SMF void setEFlags(Bit32u val) BX_CPP_AttrRegparmN(1);
@@ -2866,10 +2866,6 @@
   BX_SMF void    debug_disasm_instruction(bx_address offset);
 #endif
 
-#if BX_EXTERNAL_DEBUGGER
-  BX_SMF void    trap_debugger(bx_bool callnow);
-#endif
-
 #if BX_X86_DEBUGGER
   // x86 hardware debug support
   BX_SMF Bit32u hwdebug_compare(bx_address laddr, unsigned size,

Index: extdb.cc
===================================================================
RCS file: /cvsroot/bochs/bochs/cpu/extdb.cc,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- extdb.cc	27 Apr 2006 15:11:45 -0000	1.20
+++ extdb.cc	25 Jun 2006 21:44:46 -0000	1.21
@@ -9,8 +9,8 @@
 #  error "extdb.cc only supported in win32 environment"
 #endif
 
-#include "iodev/iodev.h"
 #include "cpu.h"
+#include "iodev/iodev.h"
 #include "extdb.h"
 
 TRegs regs;
@@ -93,9 +93,6 @@
 #if BX_CPU_LEVEL >= 4
      regs.cr4 = cpu->cr4.getRegister();
 #endif
-     //regs.cr5 = cpu->cr5;
-     //regs.cr6 = cpu->cr6;
-     //regs.cr7 = cpu->cr7;
      regs.fsbase = cpu->sregs[BX_SEG_REG_FS].cache.u.segment.base;
      regs.gsbase = cpu->sregs[BX_SEG_REG_GS].cache.u.segment.base;
 #if BX_SUPPORT_X86_64
@@ -117,3 +114,11 @@
        call_debugger(&regs,cpu->mem->vector,cpu->mem->len);
      }
 }
+
+void trap_debugger(bx_bool callnow)
+{
+  regs.debug_state = debug_step;
+  if (callnow) {
+    bx_external_debugger(BX_CPU_THIS);
+  }
+}

Index: extdb.h
===================================================================
RCS file: /cvsroot/bochs/bochs/cpu/extdb.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- extdb.h	27 Apr 2006 15:11:45 -0000	1.8
+++ extdb.h	25 Jun 2006 21:44:46 -0000	1.9
@@ -33,5 +33,6 @@
 extern char debug_loaded;
 
 void bx_external_debugger(BX_CPU_C *cpu);
+void trap_debugger(bx_bool callnow);
 
 #endif

Index: soft_int.cc
===================================================================
RCS file: /cvsroot/bochs/bochs/cpu/soft_int.cc,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- soft_int.cc	9 Jun 2006 22:29:07 -0000	1.30
+++ soft_int.cc	25 Jun 2006 21:44:46 -0000	1.31
@@ -30,6 +30,10 @@
 #include "cpu.h"
 #define LOG_THIS BX_CPU_THIS_PTR
 
+#if BX_EXTERNAL_DEBUGGER
+#include "extdb.h"
+#endif
+
 void BX_CPU_C::BOUND_GwMa(bxInstruction_c *i)
 {
   if (i->modC0()) {


Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Bochs-cvs mailing list
Bochs-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/bochs-cvs
[prev in list] [next in list] [prev in thread] [next in thread]