working on x86 instruction decoding support

[palacios.git] / palacios / src / geekos / svm_ctrl_regs.c

diff --git a/palacios/src/geekos/svm_ctrl_regs.c b/palacios/src/geekos/svm_ctrl_regs.c
index 656bb9e..a0c5e1a 100644 (file)
--- a/palacios/src/geekos/svm_ctrl_regs.c
+++ b/palacios/src/geekos/svm_ctrl_regs.c
@@ -3,10 +3,10 @@
 #include <geekos/vmm.h>
 #include <geekos/vmcb.h>
 #include <geekos/vmm_emulate.h>
-
+#include <geekos/vm_guest_mem.h>
 
 int handle_cr0_write(struct guest_info * info, ullong_t * new_cr0) {
-  vmcb_ctrl_t * ctrl_area = GET_VMCB_CTRL_AREA((vmcb_t *)(info->vmm_data));
+  //vmcb_ctrl_t * ctrl_area = GET_VMCB_CTRL_AREA((vmcb_t *)(info->vmm_data));
   vmcb_saved_state_t * guest_state = GET_VMCB_SAVE_STATE_AREA((vmcb_t*)(info->vmm_data));
   char instr[15];
   
@@ -18,13 +18,33 @@ int handle_cr0_write(struct guest_info * info, ullong_t * new_cr0) {
     int index = 0;
 
     while (is_prefix_byte(instr[index])) {
+      PrintDebug("instr(%d): 0x%x\n", index, instr[index]);
       index++; 
     }
-    
+    PrintDebug("instr(%d): 0x%x\n", index, instr[index]);
+    PrintDebug("instr(%d): 0x%x\n", index+1, instr[index + 1]);
+
     if ((instr[index] == cr_access_byte) && 
-       (instr[index + 1] == lmsw_byte)) {
+       (instr[index + 1] == lmsw_byte) && 
+       (MODRM_REG(instr[index + 2]) == lmsw_reg_byte)) {
+ 
+      addr_t first_operand;
+      addr_t second_operand;
+     
       // LMSW
       // decode mod/RM
+      index += 2;
+ 
+
+      if (decode_operands16(&(info->vm_regs), instr + index, &first_operand, &second_operand, REG16) != 0) {
+       // error... don't know what to do
+       return -1;
+      }
+
+      PrintDebug("FirstOperand addr: %x, RAX addr: %x\n", first_operand, &(info->vm_regs.rax));
+      
+
+      
 
     } else if ((instr[index] == cr_access_byte) && 
               (instr[index + 1] == clts_byte)) {