Changeset 13968 in vbox

Timestamp:

Nov 7, 2008 3:48:52 PM (16 years ago)

Author:

vboxsync

Message:

• fixed bug in implementation of ARPL with memory operand, perventing OS2 from workings
• imporved QEMU logging

Location:

trunk/src/recompiler_new

Files:

• Sun/config.h (modified) (1 diff)
• VBoxRecompiler.c (modified) (1 diff)
• osdep.h (modified) (2 diffs)
• target-i386/translate.c (modified) (7 diffs)

trunk/src/recompiler_new/Sun/config.h

@@ -34 +34 @@
 /* Uncomment to see emulated CPU state changes */
 /* #define VBOX_DUMP_STATE */
-
+/* Uncomment to see QEMU logging, goes to /tmp/vbox-qemu.log */
+/* #define DEBUG_ALL_LOGGING */
+/* Uncomment to see generated code */
+/* #define DEBUG_DISAS */

trunk/src/recompiler_new/VBoxRecompiler.c

@@ -387 +387 @@
 #ifdef DEBUG_ALL_LOGGING
     loglevel = ~0;
+    logfile = fopen("/tmp/vbox-qemu.log", "w");
 #endif
 

trunk/src/recompiler_new/osdep.h

@@ -8 +8 @@
 #include <iprt/stdarg.h>
 #include <iprt/string.h>
+
+#include "config.h"
 
 #ifndef _MSC_VER
@@ -33 +35 @@
 #define fflush(file)            RTLogFlush(NULL)
 #define printf(...)             LogIt(LOG_INSTANCE, 0, LOG_GROUP_REM_PRINTF, (__VA_ARGS__))
-#define fprintf(logfile, ...)   LogIt(LOG_INSTANCE, 0, LOG_GROUP_REM_PRINTF, (__VA_ARGS__))
+/* If DEBUG_ALL_LOGGING - goes to QEMU log file */
+#ifndef DEBUG_ALL_LOGGING
+ #define fprintf(logfile, ...)   LogIt(LOG_INSTANCE, 0, LOG_GROUP_REM_PRINTF, (__VA_ARGS__))
+#endif
 
 #define assert(cond) Assert(cond)

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

@@ -828 +828 @@
 
     skip_label = gen_new_label();
-    /* t0 = tcg_temp_local_new(TCG_TYPE_TL); */
-    t0 = cpu_tmp0;
+    t0 = tcg_temp_local_new(TCG_TYPE_TL);
+    /* t0 = cpu_tmp0; */
 
     tcg_gen_ld32u_tl(t0, cpu_env, offsetof(CPUState, interrupt_request));
@@ -840 +840 @@
     /** @todo: predict branch as taken */
     tcg_gen_brcondi_i32(TCG_COND_EQ, t0, 0, skip_label);
-    /* tcg_temp_free(t0); */
+    tcg_temp_free(t0);
 
     tcg_gen_helper_0_0(helper_check_external_event);
@@ -7849 +7849 @@
         {
             int label1;
-            TCGv t0, t1, t2;
+            TCGv t0, t1, t2, a0;
 
             if (!s->pe || s->vm86)
@@ -7856 +7856 @@
             t1 = tcg_temp_local_new(TCG_TYPE_TL);
             t2 = tcg_temp_local_new(TCG_TYPE_TL);
+#ifdef VBOX
+            a0 = tcg_temp_local_new(TCG_TYPE_TL);
+#endif
             ot = OT_WORD;
             modrm = ldub_code(s->pc++);
@@ -7863 +7866 @@
             if (mod != 3) {
                 gen_lea_modrm(s, modrm, &reg_addr, &offset_addr);
+#ifdef VBOX
+                tcg_gen_mov_tl(a0, cpu_A0);
+#endif
                 gen_op_ld_v(ot + s->mem_index, t0, cpu_A0);
             } else {
@@ -7878 +7884 @@
             gen_set_label(label1);
             if (mod != 3) {
+#ifdef VBOX
+                /* cpu_A0 doesn't survive branch */
+                gen_op_st_v(ot + s->mem_index, t0, a0);
+#else
                 gen_op_st_v(ot + s->mem_index, t0, cpu_A0);
+#endif
             } else {
                 gen_op_mov_reg_v(ot, rm, t0);
@@ -7891 +7902 @@
             tcg_temp_free(t1);
             tcg_temp_free(t2);
+#ifdef VBOX
+            tcg_temp_free(a0);
+#endif
         }
         break;