Index: /trunk/src/VBox/VMM/VMMSwitcher/LegacyandAMD64.mac
===================================================================
--- /trunk/src/VBox/VMM/VMMSwitcher/LegacyandAMD64.mac	(revision 48242)
+++ /trunk/src/VBox/VMM/VMMSwitcher/LegacyandAMD64.mac	(revision 48243)
@@ -473,5 +473,13 @@
     mov     cr3, eax
     DEBUG32_CHAR('?')
+%ifdef VBOX_WITH_64ON32_CMOS_DEBUG
     DEBUG_CMOS_TRASH_AL 17h
+    jmp     .first_jmp
+    times 65 db 90h
+.first_jmp:
+    times 65 db 90h
+.second_jmp:
+    DEBUG_CMOS_TRASH_AL 18h
+%endif
 
     ;;
@@ -486,5 +494,5 @@
 GLOBALNAME IDEnterTarget
     DEBUG32_CHAR('1')
-    DEBUG_CMOS_TRASH_AL 18h
+    DEBUG_CMOS_TRASH_AL 19h
 
     ; 1. Disable paging.
@@ -493,5 +501,5 @@
     mov     cr0, ebx
     DEBUG32_CHAR('2')
-    DEBUG_CMOS_TRASH_AL 19h
+    DEBUG_CMOS_TRASH_AL 1ah
 
 %ifdef VBOX_WITH_CRASHDUMP_MAGIC
@@ -504,5 +512,5 @@
     or      ecx, X86_CR4_PAE
     mov     cr4, ecx
-    DEBUG_CMOS_TRASH_AL 1ah
+    DEBUG_CMOS_TRASH_AL 1bh
 
     ; 3. Load long mode intermediate CR3.
@@ -511,5 +519,5 @@
     mov     cr3, ecx
     DEBUG32_CHAR('3')
-    DEBUG_CMOS_TRASH_AL 1bh
+    DEBUG_CMOS_TRASH_AL 1ch
 
 %ifdef VBOX_WITH_CRASHDUMP_MAGIC
@@ -528,5 +536,5 @@
     mov     edx, esi
     DEBUG32_CHAR('4')
-    DEBUG_CMOS_TRASH_AL 1ch
+    DEBUG_CMOS_TRASH_AL 1dh
 
 %ifdef VBOX_WITH_CRASHDUMP_MAGIC
@@ -552,5 +560,5 @@
 NAME(IDEnter64Mode):
     DEBUG64_CHAR('6')
-    DEBUG_CMOS_TRASH_AL 1dh
+    DEBUG_CMOS_TRASH_AL 1eh
     jmp     [NAME(pICEnterTarget) wrt rip]
 
@@ -575,5 +583,5 @@
 ALIGNCODE(16)
 GLOBALNAME ICEnterTarget
-    ;DEBUG_CMOS_TRASH_AL 1eh
+    ;DEBUG_CMOS_TRASH_AL 1fh
     ; Load CPUM pointer into rdx
     mov     rdx, [NAME(pCpumIC) wrt rip]