added guest-iso directive to test vm makefile

[palacios.git] / palacios / src / palacios / svm_lowlevel.asm

diff --git a/palacios/src/palacios/svm_lowlevel.asm b/palacios/src/palacios/svm_lowlevel.asm
index 503776f..ac646b2 100644 (file)
--- a/palacios/src/palacios/svm_lowlevel.asm
+++ b/palacios/src/palacios/svm_lowlevel.asm
@@ -1,4 +1,23 @@
 ;  -*- fundamental -*-
+;; 
+;; This file is part of the Palacios Virtual Machine Monitor developed
+;; by the V3VEE Project with funding from the United States National 
+;; Science Foundation and the Department of Energy.  
+;;
+;; The V3VEE Project is a joint project between Northwestern University
+;; and the University of New Mexico.  You can find out more at 
+;; http://www.v3vee.org
+;;
+;; Copyright (c) 2008, Jack Lange <jarusl@cs.northwestern.edu> 
+;; Copyright (c) 2008, The V3VEE Project <http://www.v3vee.org> 
+;; All rights reserved.
+;;
+;; Author: Jack Lange <jarusl@cs.northwestern.edu>
+;;
+;; This is free software.  You are permitted to use,
+;; redistribute, and modify it as specified in the file "V3VEE_LICENSE".
+;;
+
 
 
 %ifndef SVM_ASM
@@ -10,7 +29,6 @@
 SVM_ERROR equ 0xFFFFFFFF
 SVM_SUCCESS equ 0x00000000
 
-EXPORT DisableInts
 
 
 EXPORT exit_test
@@ -95,12 +113,6 @@ SVM_HANDLER_HALT equ 0x2
 ;CLGI   equ db 0x0F,0x01,0xDD
 
 
-align 8
-DisableInts:
-       cli
-       ret
-
-
 
 align 8
 CLGI:
@@ -143,6 +155,8 @@ safe_svm_launch:
        push    ebp
        mov     ebp, esp
        pushf
+       push    fs
+       push    gs
        pusha                                   ;; Save Host state
 
 
@@ -166,6 +180,8 @@ safe_svm_launch:
        add     esp, 4                          ;; skip past the gpr ptr
        
        popa                                    ;; Restore Host state
+       pop     gs
+       pop     fs
        popf
        pop     ebp
        ret