#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>
return -1;
}
- PrintDebug("IN on port %d (0x%x)\n", io_info->port, io_info->port);
if (io_info->sz8) {
read_size = 1;
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.....
PrintDebug("INS on port %d (0x%x)\n", io_info->port, io_info->port);
- if (io_info->sz8) {
+ if (io_info->sz8) {
read_size = 1;
} else if (io_info->sz16) {
read_size = 2;
} else if (io_info->sz32) {
read_size = 4;
+ } else {
+ PrintDebug("io_info Invalid Size\n");
+ return -1;
}
-
+
if (io_info->addr16) {
mask = 0xffff;
} else if (io_info->addr32) {
} else if (io_info->addr64) {
mask = 0xffffffffffffffffLL;
} else {
- // should never happen
- return -1;
+ // 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) {
- rep_num = info->vm_regs.rcx & mask;
+ // rep_num = info->vm_regs.rcx & mask;
+ rep_num = info->vm_regs.rcx;
}
+ PrintDebug("INS size=%d for %d steps\n", read_size, rep_num);
while (rep_num > 0) {
addr_t host_addr;
if (guest_va_to_host_va(info, dst_addr, &host_addr) == -1) {
// either page fault or gpf...
+ PrintDebug("Could not convert Guest VA to host VA\n");
+ return -1;
}
if (hook->read(io_info->port, (char*)host_addr, read_size, hook->priv_data) != read_size) {
return -1;
}
- PrintDebug("OUT on port %d (0x%x)\n", io_info->port, io_info->port);
if (io_info->sz8) {
write_size = 1;
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.....
} 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
- 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;