large scale namespace changes

[palacios.git] / palacios / src / palacios / vmm_ctrl_regs.c

diff --git a/palacios/src/palacios/vmm_ctrl_regs.c b/palacios/src/palacios/vmm_ctrl_regs.c
index 5bf6dc1..15ca631 100644 (file)
--- a/palacios/src/palacios/vmm_ctrl_regs.c
+++ b/palacios/src/palacios/vmm_ctrl_regs.c
@@ -1,5 +1,21 @@
-/* Northwestern University */
-/* (c) 2008, Jack Lange <jarusl@cs.northwestern.edu> */
+/* 
+ * 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".
+ */
 
 #include <palacios/vmm_mem.h>
 #include <palacios/vmm.h>
@@ -26,7 +42,7 @@
 // First Attempt = 494 lines
 // current = 106 lines
 int handle_cr0_write(struct guest_info * info) {
-  char instr[15];
+  uchar_t instr[15];
   int ret;
   struct x86_instr dec_instr;
 
@@ -102,7 +118,7 @@ int handle_cr0_write(struct guest_info * info) {
          *shadow_cr0 = *new_cr0;
          shadow_cr0->et = 1;
          
-         if (get_mem_mode(info) == VIRTUAL_MEM) {
+         if (v3_get_mem_mode(info) == VIRTUAL_MEM) {
            struct cr3_32 * shadow_cr3 = (struct cr3_32 *)&(info->shdw_pg_state.shadow_cr3);
            
            info->ctrl_regs.cr3 = *(addr_t*)shadow_cr3;
@@ -140,7 +156,7 @@ int handle_cr0_write(struct guest_info * info) {
 // First attempt = 253 lines
 // current = 51 lines
 int handle_cr0_read(struct guest_info * info) {
-  char instr[15];
+  uchar_t instr[15];
   int ret;
   struct x86_instr dec_instr;
 
@@ -206,7 +222,7 @@ int handle_cr0_read(struct guest_info * info) {
 // current = 65 lines
 int handle_cr3_write(struct guest_info * info) {
   int ret;
-  char instr[15];
+  uchar_t instr[15];
   struct x86_instr dec_instr;
 
   if (info->mem_mode == PHYSICAL_MEM) { 
@@ -293,7 +309,7 @@ int handle_cr3_write(struct guest_info * info) {
 // first attempt = 156 lines
 // current = 36 lines
 int handle_cr3_read(struct guest_info * info) {
-  char instr[15];
+  uchar_t instr[15];
   int ret;
   struct x86_instr dec_instr;