svm_io.c: these now continue to operate on OUTS, INS even if the address type

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

diff --git a/palacios/src/palacios/svm_io.c b/palacios/src/palacios/svm_io.c
index 38f0b8e..f6e9c62 100644 (file)
--- a/palacios/src/palacios/svm_io.c
+++ b/palacios/src/palacios/svm_io.c
@@ -1,7 +1,7 @@
 #include <palacios/svm_io.h>
 #include <palacios/vmm_io.h>
 #include <palacios/vmm_ctrl_regs.h>
-#include <palacios/vmm_emulate.h>
+#include <palacios/vmm_decoder.h>
 #include <palacios/vm_guest_mem.h>
 
 
@@ -20,7 +20,6 @@ int handle_svm_io_in(struct guest_info * info) {
     return -1;
   }
 
-  PrintDebug("IN on  port %d (0x%x)\n", io_info->port, io_info->port);
 
   if (io_info->sz8) { 
     read_size = 1;
@@ -30,6 +29,7 @@ int handle_svm_io_in(struct guest_info * info) {
     read_size = 4;
   }
 
+  PrintDebug("IN of %d bytes on port %d (0x%x)\n", read_size, io_info->port, io_info->port);
 
   if (hook->read(io_info->port, &(info->vm_regs.rax), read_size, hook->priv_data) != read_size) {
     // not sure how we handle errors.....
@@ -103,6 +103,10 @@ int handle_svm_io_ins(struct guest_info * info) {
   } else {
     // This value should be set depending on the host register size...
     mask = get_gpr_mask(info);
+
+    PrintDebug("INS io_info invalid address size, assuming 32, io_info=0x%x\n",*((uint_t*)(io_info)));
+    // PrintDebug("INS Aborted... Check implementation\n");
+    //return -1;
   }
 
   if (io_info->rep) {
@@ -157,7 +161,6 @@ int handle_svm_io_out(struct guest_info * info) {
     return -1;
   }
 
-  PrintDebug("OUT on  port %d (0x%x)\n", io_info->port, io_info->port);
 
   if (io_info->sz8) { 
     write_size = 1;
@@ -167,6 +170,7 @@ int handle_svm_io_out(struct guest_info * info) {
     write_size = 4;
   }
 
+  PrintDebug("OUT of %d bytes on  port %d (0x%x)\n", write_size, io_info->port, io_info->port);
 
   if (hook->write(io_info->port, &(info->vm_regs.rax), write_size, hook->priv_data) != write_size) {
     // not sure how we handle errors.....
@@ -233,15 +237,22 @@ int handle_svm_io_outs(struct guest_info * info) {
   } else if (io_info->addr64) {
     mask = 0xffffffffffffffffLL;
   } else {
+    // This value should be set depending on the host register size...
+    mask = get_gpr_mask(info);
+
+    PrintDebug("OUTS io_info invalid address size, assuming 32, io_info=0x%x\n",*((uint_t*)(io_info)));
+    // PrintDebug("INS Aborted... Check implementation\n");
+    //return -1;
     // should never happen
-    PrintDebug("Invalid Address length\n");
-    return -1;
+    //PrintDebug("Invalid Address length\n");
+    //return -1;
   }
 
   if (io_info->rep) {
     rep_num = info->vm_regs.rcx & mask;
   }
 
+  PrintDebug("OUTS size=%d for %d steps\n", write_size, rep_num);
 
   while (rep_num > 0) {
     addr_t host_addr;