Changeset 15009 in vbox

Timestamp:

Dec 4, 2008 11:27:46 PM (16 years ago)

Author:

vboxsync

Message:

new_recompiler: cleanup, optimization, compile with the right tool - gets rid of the nasty bug with bootmenu

Location:

trunk/src

Files:

• VBox/VMM/REMInternal.h (modified) (1 diff)
• recompiler_new/Makefile.kmk (modified) (3 diffs)
• recompiler_new/VBoxRecompiler.c (modified) (6 diffs)
• recompiler_new/cpu-all.h (modified) (5 diffs)
• recompiler_new/target-i386/op_helper.c (modified) (1 diff)
• recompiler_new/target-i386/translate.c (modified) (1 diff)

trunk/src/VBox/VMM/REMInternal.h

@@ -288 +288 @@
 void    remR3DmaRun(CPUState *env);
 void    remR3TimersRun(CPUState *env);
-int     remR3NotifyTrap(CPUState *env, uint32_t uTrap, uint32_t uErrorCode, uint32_t pvNextEIP);
+int     remR3NotifyTrap(CPUState *env, uint32_t uTrap, uint32_t uErrorCode, RTGCPTR pvNextEIP);
 void    remR3TrapStat(CPUState *env, uint32_t uTrap);
 void    remR3CpuId(CPUState *env, unsigned uOperator, void *pvEAX, void *pvEBX, void *pvECX, void *pvEDX);

trunk/src/recompiler_new/Makefile.kmk

@@ -33 +33 @@
 endif
 
+TEMPLATE_DUMMY = dummy template (move to kBuild)
 ifeq ($(KBUILD_TARGET), win)
- TEMPLATE_DUMMY = dummy template (move to kBuild)
  $(REM_MOD)_TOOL.win.x86    = MINGW32
  $(REM_MOD)_TOOL.win.amd64  = XGCCAMD64LINUX
@@ -40 +40 @@
  $(REM_MOD)_SDKS.win.x86    = W32API
  $(REM_MOD)_ASFLAGS         = -x assembler-with-cpp
- $(REM_MOD)_CFLAGS          = -Wall -g
- $(REM_MOD)_CFLAGS.debug    = -O0
- $(REM_MOD)_CFLAGS.release += -fno-gcse -O2
+ $(REM_MOD)_CFLAGS          = -Wall
+ $(REM_MOD)_CFLAGS.debug    = -O0 -g
+ $(REM_MOD)_CFLAGS.release += -fno-gcse -O2 
  $(REM_MOD)_CFLAGS.profile  = $($(REM_MOD)_CFLAGS.release)
  $(REM_MOD)_CFLAGS.kprofile = $($(REM_MOD)_CFLAGS.release)
@@ -55 +55 @@
  USE_REM_IMP = 1
 else
- $(REM_MOD)_TEMPLATE  = VBOXR3NP
+
+ # Unfortunately little pinguins tend to have default compilers no suitable 
+ # for real compilation, so search better alternatives 
+ if1of ($(KBUILD_TARGET), linux)
+  $(REM_MOD)_TOOL      = GCC3V3
+  $(REM_MOD)_TEMPLATE  = DUMMY
+  $(REM_MOD)_CFLAGS    = -fPIC                                          \
+                         -Wall -fno-strict-aliasing -Wno-unused         \
+                         -Wno-long-long -Wno-sign-compare
+  $(REM_MOD)_CFLAGS.x86      = -m32
+  $(REM_MOD)_CFLAGS.amd64    = -m64
+  $(REM_MOD)_CFLAGS.debug    = -g -O0
+  $(REM_MOD)_CFLAGS.release += -O2
+ else
+  $(REM_MOD)_TEMPLATE  = VBOXR3N 
+ endif
 
  IMPORT_LIBS          += VBoxREM

trunk/src/recompiler_new/VBoxRecompiler.c

@@ -751 +751 @@
         Assert(!(interrupt_request & ~(CPU_INTERRUPT_HARD | CPU_INTERRUPT_EXIT | CPU_INTERRUPT_EXITTB | CPU_INTERRUPT_TIMER | CPU_INTERRUPT_EXTERNAL_HARD | CPU_INTERRUPT_EXTERNAL_EXIT | CPU_INTERRUPT_EXTERNAL_TIMER)));
         Assert(!pVM->rem.s.Env.singlestep_enabled);
-#if 1
-
         /*
          * Now we set the execute single instruction flag and enter the cpu_exec loop.
@@ -853 +851 @@
          * Switch back the state.
          */
-#else
-        pVM->rem.s.Env.interrupt_request = 0;
-        cpu_single_step(&pVM->rem.s.Env, 1);
-
-        /*
-         * Execute and handle the return code.
-         * We execute without enabling the cpu tick, so on success we'll
-         * just flip it on and off to make sure it moves.
-         *
-         * (We do not use emulate_single_instr() because that doesn't enter the
-         * right way in will cause serious trouble if a longjmp was attempted.)
-         */
-# ifdef DEBUG_bird
-        remR3DisasInstr(&pVM->rem.s.Env, 1, "REMR3EmulateInstruction");
-# endif
-        TMNotifyStartOfExecution(pVM);
-        int cTimesMax = 16384;
-        uint32_t eip = pVM->rem.s.Env.eip;
-        do
-        {
-            rc = cpu_exec(&pVM->rem.s.Env);
-
-        } while (   eip == pVM->rem.s.Env.eip
-                 && (rc == EXCP_DEBUG || rc == EXCP_EXECUTE_RAW)
-                 && --cTimesMax > 0);
-        TMNotifyEndOfExecution(pVM);
-        switch (rc)
-        {
-            /*
-             * Single step, we assume!
-             * If there was a breakpoint there we're fucked now.
-             */
-            case EXCP_DEBUG:
-            {
-                Log2(("REMR3EmulateInstruction: cpu_exec -> EXCP_DEBUG\n"));
-                rc = VINF_EM_RESCHEDULE;
-                break;
-            }
-
-            /*
-             * We cannot be interrupted!
-             */
-            case EXCP_INTERRUPT:
-                AssertMsgFailed(("Shouldn't happen! Everything was locked!\n"));
-                rc = VERR_INTERNAL_ERROR;
-                break;
-
-            /*
-             * hlt instruction.
-             */
-            case EXCP_HLT:
-                Log2(("REMR3EmulateInstruction: cpu_exec -> EXCP_HLT\n"));
-                rc = VINF_EM_HALT;
-                break;
-
-            /*
-             * The VM has halted.
-             */
-            case EXCP_HALTED:
-                Log2(("REMR3EmulateInstruction: cpu_exec -> EXCP_HALTED\n"));
-                rc = VINF_EM_HALT;
-                break;
-
-            /*
-             * Switch to RAW-mode.
-             */
-            case EXCP_EXECUTE_RAW:
-                Log2(("REMR3EmulateInstruction: cpu_exec -> EXCP_EXECUTE_RAW\n"));
-                rc = VINF_EM_RESCHEDULE_RAW;
-                break;
-
-            /*
-             * Switch to hardware accelerated RAW-mode.
-             */
-            case EXCP_EXECUTE_HWACC:
-                Log2(("REMR3EmulateInstruction: cpu_exec -> EXCP_EXECUTE_HWACC\n"));
-                rc = VINF_EM_RESCHEDULE_HWACC;
-                break;
-
-            /*
-             * An EM RC was raised (VMR3Reset/Suspend/PowerOff/some-fatal-error).
-             */
-            case EXCP_RC:
-                Log2(("REMR3EmulateInstruction: cpu_exec -> EXCP_RC rc=%Rrc\n", pVM->rem.s.rc));
-                rc = pVM->rem.s.rc;
-                pVM->rem.s.rc = VERR_INTERNAL_ERROR;
-                break;
-
-            /*
-             * Figure out the rest when they arrive....
-             */
-            default:
-                AssertMsgFailed(("rc=%d\n", rc));
-                Log2(("REMR3EmulateInstruction: cpu_exec -> %d\n", rc));
-                rc = VINF_SUCCESS;
-                break;
-        }
-
-        /*
-         * Switch back the state.
-         */
-        cpu_single_step(&pVM->rem.s.Env, 0);
-#endif
         pVM->rem.s.Env.interrupt_request = interrupt_request;
         rc2 = REMR3StateBack(pVM);
@@ -1581 +1476 @@
  * @param   pvNextEIP       Next EIP
  */
-int remR3NotifyTrap(CPUState *env, uint32_t uTrap, uint32_t uErrorCode, uint32_t pvNextEIP)
+int remR3NotifyTrap(CPUState *env, uint32_t uTrap, uint32_t uErrorCode, RTGCPTR pvNextEIP)
 {
     PVM pVM = env->pVM;
@@ -1602 +1497 @@
     }
 #endif
-    Log(("remR3NotifyTrap: uTrap=%x error=%x next_eip=%RGv eip=%RGv cr2=%RGv\n", uTrap, uErrorCode, (RTGCPTR)pvNextEIP, (RTGCPTR)env->eip, (RTGCPTR)env->cr[2]));
+    Log(("remR3NotifyTrap: uTrap=%x error=%x next_eip=%RGv eip=%RGv cr2=%RGv\n", uTrap, uErrorCode, pvNextEIP, (RTGCPTR)env->eip, (RTGCPTR)env->cr[2]));
     if(   uTrap < 0x20
        && (env->cr[0] & X86_CR0_PE)
@@ -1612 +1507 @@
         if(pVM->rem.s.uPendingException == uTrap && ++pVM->rem.s.cPendingExceptions > 512)
         {
-            LogRel(("VERR_REM_TOO_MANY_TRAPS -> uTrap=%x error=%x next_eip=%RGv eip=%RGv cr2=%RGv\n", uTrap, uErrorCode, (RTGCPTR)pvNextEIP, (RTGCPTR)env->eip, (RTGCPTR)env->cr[2]));
+            LogRel(("VERR_REM_TOO_MANY_TRAPS -> uTrap=%x error=%x next_eip=%RGv eip=%RGv cr2=%RGv\n", uTrap, uErrorCode, pvNextEIP, (RTGCPTR)env->eip, (RTGCPTR)env->cr[2]));
             remR3RaiseRC(env->pVM, VERR_REM_TOO_MANY_TRAPS);
             return VERR_REM_TOO_MANY_TRAPS;
@@ -2141 +2036 @@
     Assert(pVM->rem.s.fInREM);
 
-        /*
+    /*
      * Copy back the registers.
      * This is done in the order they are declared in the CPUMCTX structure.

trunk/src/recompiler_new/cpu-all.h

@@ -279 +279 @@
 #if defined(VBOX) && defined(REM_PHYS_ADDR_IN_TLB)
 
-DECLINLINE(int) ldub_p(void *ptr)
+DECLINLINE(uint8_t) ldub_p(void *ptr)
 {
     VBOX_CHECK_ADDR(ptr);
@@ -285 +285 @@
 }
 
-DECLINLINE(int) ldsb_p(void *ptr)
+DECLINLINE(int8_t) ldsb_p(void *ptr)
 {
     VBOX_CHECK_ADDR(ptr);
@@ -297 +297 @@
 }
 
-DECLINLINE(int) lduw_le_p(void *ptr)
+DECLINLINE(uint32_t) lduw_le_p(void *ptr)
 {
     VBOX_CHECK_ADDR(ptr);
@@ -303 +303 @@
 }
 
-DECLINLINE(int) ldsw_le_p(void *ptr)
+DECLINLINE(int32_t) ldsw_le_p(void *ptr)
 {
     VBOX_CHECK_ADDR(ptr);
@@ -315 +315 @@
 }
 
-DECLINLINE(int) ldl_le_p(void *ptr)
+DECLINLINE(uint32_t) ldl_le_p(void *ptr)
 {
     VBOX_CHECK_ADDR(ptr);

trunk/src/recompiler_new/target-i386/op_helper.c

@@ -5643 +5643 @@
     target_ulong old_eip;
 
-    /* ensures env is loaded in ebp! */
+    /* ensures env is loaded! */
     CPUX86State *savedenv = env;
     env = env1;

trunk/src/recompiler_new/target-i386/translate.c

@@ -4640 +4640 @@
     s->rip_offset = 0; /* for relative ip address */
 #ifdef VBOX
+    /* nike: seems only slow down things */
+# if 0
     /* Always update EIP. Otherwise one must be very careful with generated code that can raise exceptions. */
+
     gen_update_eip(pc_start - s->cs_base);
-#endif
+# endif
+#endif
+
  next_byte:
     b = ldub_code(s->pc);