* Copyright (c) 2001,2003,2004 David H. Hovemeyer <daveho@cs.umd.edu>
* Copyright (c) 2003, Jeffrey K. Hollingsworth <hollings@cs.umd.edu>
* Copyright (c) 2004, Iulian Neamtiu <neamtiu@cs.umd.edu>
- * $Revision: 1.25 $
+ * $Revision: 1.29 $
*
* This is free software. You are permitted to use,
* redistribute, and modify it as specified in the file "COPYING".
-int IO_Read(ushort_t port, void * dst, uint_t length) {
+int IO_Read(ushort_t port, void * dst, uint_t length, uint_t io_width) {
uchar_t * iter = dst;
uint_t i;
-int IO_Write(ushort_t port, void * src, uint_t length) {
+int IO_Write(ushort_t port, void * src, uint_t length, uint_t io_width) {
uchar_t * iter = src;
uint_t i;
}
+
+int IO_Write_to_Serial(ushort_t port, void * src, uint_t length, uint_t io_width) {
+ SerialPrint("Output from Guest on port %d (0x%x) Length=%d\n", port, port, length);
+ SerialMemDump(src, length);
+ return length;
+}
+
+
void BuzzVM()
{
int x;
-#if 0
+#if 1
SerialPrint("Dumping VM kernel Code (first 128 bytes @ 0x%x)\n", 0x100000);
- SerialMemDump((unsigned char *)0xfe000, 4096);
+ SerialMemDump((unsigned char *)0x100000, 256);
/*
SerialPrint("Dumping kernel Code (first 512 bytes @ 0x%x)\n",KERNEL_START);
SerialMemDump((unsigned char *)VM_KERNEL_START, 512);
vm_info.rip = rip;
rsp = (addr_t)Alloc_Page();
- vm_info.rsp = (rsp +4092 );// - 0x2000;
+ vm_info.vm_regs.rsp = (rsp +4092 );// - 0x2000;
} else {
add_shadow_region(&(vm_info.mem_map),ent);
hook_io_port(&(vm_info.io_map), 0x61, &IO_Read, &IO_Write);
+ hook_io_port(&(vm_info.io_map), 0x05, &IO_Read, &IO_Write_to_Serial);
+
/*
vm_info.cr0 = 0;
vm_info.cs.base=0xf000;
vm_info.cs.limit=0xffff;
*/
- vm_info.rip = 0xfff0;
- vm_info.rsp = 0x0;
+ //vm_info.rip = 0xfff0;
+
+ vm_info.rip = 0;
+ vm_info.vm_regs.rsp = 0x0;
}
- PrintBoth("Initializing Guest (eip=0x%.8x) (esp=0x%.8x)\n", (uint_t)vm_info.rip,(uint_t)vm_info.rsp);
+ PrintBoth("Initializing Guest (eip=0x%.8x) (esp=0x%.8x)\n", (uint_t)vm_info.rip,(uint_t)vm_info.vm_regs.rsp);
(vmm_ops).init_guest(&vm_info);
PrintBoth("Starting Guest\n");
(vmm_ops).start_guest(&vm_info);