summaryrefslogtreecommitdiff
path: root/src/VBox/VMM/include/VMMSwitcher.mac
diff options
context:
space:
mode:
authorLorry Tar Creator <lorry-tar-importer@baserock.org>2014-03-26 19:21:20 +0000
committer <>2014-05-08 15:03:54 +0000
commitfb123f93f9f5ce42c8e5785d2f8e0edaf951740e (patch)
treec2103d76aec5f1f10892cd1d3a38e24f665ae5db /src/VBox/VMM/include/VMMSwitcher.mac
parent58ed4748338f9466599adfc8a9171280ed99e23f (diff)
downloadVirtualBox-master.tar.gz
Imported from /home/lorry/working-area/delta_VirtualBox/VirtualBox-4.3.10.tar.bz2.HEADVirtualBox-4.3.10master
Diffstat (limited to 'src/VBox/VMM/include/VMMSwitcher.mac')
-rw-r--r--src/VBox/VMM/include/VMMSwitcher.mac19
1 files changed, 13 insertions, 6 deletions
diff --git a/src/VBox/VMM/include/VMMSwitcher.mac b/src/VBox/VMM/include/VMMSwitcher.mac
index dbb4ed70..ec861c6d 100644
--- a/src/VBox/VMM/include/VMMSwitcher.mac
+++ b/src/VBox/VMM/include/VMMSwitcher.mac
@@ -4,7 +4,7 @@
;
;
-; Copyright (C) 2006-2007 Oracle Corporation
+; Copyright (C) 2006-2013 Oracle Corporation
;
; This file is part of VirtualBox Open Source Edition (OSE), as
; available from http://www.virtualbox.org. This file is free software;
@@ -31,9 +31,8 @@
%define VMMSWITCHER_AMD64_TO_32 7
%define VMMSWITCHER_AMD64_TO_PAE 8
%define VMMSWITCHER_AMD64_TO_AMD64 9
-;; @todo the rest are all wrong. sync with vmm.h.
-%define VMMSWITCHER_HOST_TO_VMX 9
-%define VMMSWITCHER_HOST_TO_SVM 10
+%define VMMSWITCHER_X86_STUB 10
+%define VMMSWITCHER_AMD64_STUB 11
%define VMMSWITCHER_MAX 12
; }
@@ -128,11 +127,19 @@ BEGINCODE
;%define DEBUG_STUFF 1
%ifdef DEBUG_STUFF
- %define DEBUG_CHAR(ch) COM_CHAR ch
- %define DEBUG_S_CHAR(ch) COM_S_CHAR ch
+ %define DEBUG_CHAR(ch) COM_CHAR ch
+ %define DEBUG32_CHAR(ch) COM_CHAR ch
+ %define DEBUG64_CHAR(ch) COM_CHAR ch
+ %define DEBUG_S_CHAR(ch) COM_S_CHAR ch
+ %define DEBUG32_S_CHAR(ch) COM32_S_CHAR ch
+ %define DEBUG64_S_CHAR(ch) COM64_S_CHAR ch
%else
%define DEBUG_CHAR(ch)
+ %define DEBUG32_CHAR(ch)
+ %define DEBUG64_CHAR(ch)
%define DEBUG_S_CHAR(ch)
+ %define DEBUG32_S_CHAR(ch)
+ %define DEBUG64_S_CHAR(ch)
%endif
%endif ; !___VMMSwitcher_mac