X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fgeekos%2Fvm.c;h=661f5d18ef1f046cc660d4e7ead8597453dfa241;hb=f7cc83b3bae64c853f5b7b63e2830b1ea92dfed9;hp=358287eba6ff918d73ad758a2e1c7ee55fdfa157;hpb=fa7a42a55338e5fa49ec760b367225ca752df4fd;p=palacios.git diff --git a/palacios/src/geekos/vm.c b/palacios/src/geekos/vm.c index 358287e..661f5d1 100644 --- a/palacios/src/geekos/vm.c +++ b/palacios/src/geekos/vm.c @@ -12,11 +12,17 @@ #include #include #include +#include #include #include #include +//test decoder +//#include + +extern int parse(); + #define SPEAKER_PORT 0x61 static inline void VM_Out_Byte(ushort_t port, uchar_t value) @@ -81,6 +87,9 @@ int IO_Read_to_Serial(ushort_t port, void * dst, uint_t length, void * priv_data char * bochs_debug_buf = NULL; int bochs_debug_offset = 0; +char * bochs_info_buf = NULL; +int bochs_info_offset = 0; + int IO_BOCHS_debug(ushort_t port, void * src, uint_t length, void * priv_data) { if (!bochs_debug_buf) { @@ -90,7 +99,7 @@ int IO_BOCHS_debug(ushort_t port, void * src, uint_t length, void * priv_data) { bochs_debug_buf[bochs_debug_offset++] = *(char*)src; if ((*(char*)src == 0xa) || (bochs_debug_offset == 1023)) { - SerialPrint("BOCHS>%s", bochs_debug_buf); + SerialPrint("BOCHSDEBUG>%s", bochs_debug_buf); memset(bochs_debug_buf, 0, 1024); bochs_debug_offset = 0; } @@ -98,6 +107,22 @@ int IO_BOCHS_debug(ushort_t port, void * src, uint_t length, void * priv_data) { return length; } +int IO_BOCHS_info(ushort_t port, void * src, uint_t length, void * priv_data) { + if (!bochs_info_buf) { + bochs_info_buf = (char*)Malloc(1024); + } + + bochs_info_buf[bochs_info_offset++] = *(char*)src; + + if ((*(char*)src == 0xa) || (bochs_info_offset == 1023)) { + SerialPrint("BOCHSINFO>%s", bochs_info_buf); + memset(bochs_info_buf, 0, 1024); + bochs_info_offset = 0; + } + + return length; +} + int IO_Write_to_Serial(ushort_t port, void * src, uint_t length, void * priv_data) { SerialPrint("Output from Guest on port %d (0x%x) Length=%d\n", port, port, length); @@ -179,6 +204,8 @@ int RunVMM(struct Boot_Info * bootInfo) { + + memset(&os_hooks, 0, sizeof(struct vmm_os_hooks)); memset(&vmm_ops, 0, sizeof(struct vmm_ctrl_ops)); memset(&vm_info, 0, sizeof(struct guest_info)); @@ -193,10 +220,18 @@ int RunVMM(struct Boot_Info * bootInfo) { os_hooks.vaddr_to_paddr = &Identity; os_hooks.paddr_to_vaddr = &Identity; os_hooks.hook_interrupt = &hook_irq_stub; + os_hooks.hook_interrupt_new = &geekos_hook_interrupt_new; os_hooks.ack_irq = &ack_irq; os_hooks.get_cpu_khz = &get_cpu_khz; + + Init_VMM(&os_hooks, &vmm_ops); + + //test decoder + PrintBoth("testing decoder\n"); + parse(); + PrintBoth("testing decoder done\n"); /* MOVE THIS TO AN INIT GUEST ROUTINE */ @@ -266,13 +301,17 @@ int RunVMM(struct Boot_Info * bootInfo) { int i; void * region_start; - - PrintBoth("Guest Size: %lu\n", bootInfo->guest_size); + extern char _binary_vm_kernel_start; + PrintBoth(" Guest Load Addr: 0x%x\n", &_binary_vm_kernel_start); - struct guest_mem_layout * layout = (struct guest_mem_layout *)0x100000; + struct guest_mem_layout * layout = (struct guest_mem_layout *)&_binary_vm_kernel_start; + // SerialPrint("Guest Mem Dump at 0x%x\n", 0x100000); + //SerialMemDump((unsigned char *)(0x100000), 261 * 1024); if (layout->magic != MAGIC_CODE) { + PrintBoth("Layout Magic Mismatch (0x%x)\n", layout->magic); + return -1; } PrintBoth("%d layout regions\n", layout->num_regions); @@ -334,8 +373,8 @@ int RunVMM(struct Boot_Info * bootInfo) { hook_io_port(&(vm_info.io_map), 0x400, &IO_Read, &IO_Write_to_Serial, NULL); hook_io_port(&(vm_info.io_map), 0x401, &IO_Read, &IO_Write_to_Serial, NULL); - hook_io_port(&(vm_info.io_map), 0x402, &IO_Read, &IO_BOCHS_debug, NULL); - hook_io_port(&(vm_info.io_map), 0x403, &IO_Read, &IO_Write_to_Serial, NULL); + hook_io_port(&(vm_info.io_map), 0x402, &IO_Read, &IO_BOCHS_info, NULL); + hook_io_port(&(vm_info.io_map), 0x403, &IO_Read, &IO_BOCHS_debug, NULL); { @@ -344,16 +383,16 @@ int RunVMM(struct Boot_Info * bootInfo) { struct vm_device * pic = create_pic(); struct vm_device * keyboard = create_keyboard(); struct vm_device * pit = create_pit(); + //struct vm_device * serial = create_serial(); #define GENERIC 1 #if GENERIC generic_port_range_type range[] = { -#if 0 +#if 1 {0x00, 0x07, GENERIC_PRINT_AND_IGNORE}, // DMA 1 channels 0,1,2,3 (address, counter) - {0xc0, 0xc7, GENERIC_PRINT_AND_ -IGNORE}, // DMA 2 channels 4,5,6,7 (address, counter) + {0xc0, 0xc7, GENERIC_PRINT_AND_IGNORE}, // DMA 2 channels 4,5,6,7 (address, counter) {0x87, 0x87, GENERIC_PRINT_AND_IGNORE}, // DMA 1 channel 0 page register {0x83, 0x83, GENERIC_PRINT_AND_IGNORE}, // DMA 1 channel 1 page register {0x81, 0x81, GENERIC_PRINT_AND_IGNORE}, // DMA 1 channel 2 page register @@ -366,16 +405,21 @@ IGNORE}, // DMA 2 channels 4,5,6,7 (address, counter) {0xd0, 0xde, GENERIC_PRINT_AND_IGNORE}, // DMA 2 misc registers #endif + {0x3f8, 0x3f8+7, GENERIC_PRINT_AND_IGNORE}, // COM 1 {0x2f8, 0x2f8+7, GENERIC_PRINT_AND_IGNORE}, // COM 2 - {0x3e8, 0x3e8+7, GENERIC_PRINT_AND_IGNORE}, // COM 2 - {0x2e8, 0x2e8+7, GENERIC_PRINT_AND_IGNORE}, // COM 2 - /* + {0x3e8, 0x3e8+7, GENERIC_PRINT_AND_IGNORE}, // COM 3 + {0x2e8, 0x2e8+7, GENERIC_PRINT_AND_IGNORE}, // COM 4 + +#if 0 {0x170, 0x178, GENERIC_PRINT_AND_PASSTHROUGH}, // IDE 1 {0x376, 0x377, GENERIC_PRINT_AND_PASSTHROUGH}, // IDE 1 {0x1f0, 0x1f8, GENERIC_PRINT_AND_PASSTHROUGH}, // IDE 0 {0x3f6, 0x3f7, GENERIC_PRINT_AND_PASSTHROUGH}, // IDE 0 - */ +#endif + + +#if 0 {0x3f0, 0x3f2, GENERIC_PRINT_AND_IGNORE}, // Primary floppy controller (base,statusa/statusb,DOR) {0x3f4, 0x3f5, GENERIC_PRINT_AND_IGNORE}, // Primary floppy controller (mainstat/datarate,data) {0x3f7, 0x3f7, GENERIC_PRINT_AND_IGNORE}, // Primary floppy controller (DIR) @@ -383,13 +427,17 @@ IGNORE}, // DMA 2 channels 4,5,6,7 (address, counter) {0x374, 0x375, GENERIC_PRINT_AND_IGNORE}, // Secondary floppy controller (mainstat/datarate,data) {0x377, 0x377, GENERIC_PRINT_AND_IGNORE}, // Secondary floppy controller (DIR) +#endif + // {0x378, 0x400, GENERIC_PRINT_AND_IGNORE} + {0,0,0}, // sentinal - must be last + }; - struct vm_device * generic = create_generic(range,10, // THIS NUMBER IS CRITICAL - NULL,0,NULL,0); + struct vm_device * generic = create_generic(range, NULL, NULL); + #endif attach_device(&(vm_info), nvram); @@ -397,6 +445,7 @@ IGNORE}, // DMA 2 channels 4,5,6,7 (address, counter) attach_device(&(vm_info), pic); attach_device(&(vm_info), pit); attach_device(&(vm_info), keyboard); + // attach_device(&(vm_info), serial); #if GENERIC @@ -412,17 +461,18 @@ IGNORE}, // DMA 2 channels 4,5,6,7 (address, counter) // no longer needed since we have a keyboard device //hook_irq(&vm_info, 1); -#if 0 +#if 1 // give floppy controller to vm - hook_irq(&vm_info, 6); + hook_irq_for_guest_injection(&vm_info, 6); #endif +#if 1 //primary ide - hook_irq(&vm_info, 14); + hook_irq_for_guest_injection(&vm_info, 14); // secondary ide - hook_irq(&vm_info, 15); - + hook_irq_for_guest_injection(&vm_info, 15); +#endif vm_info.rip = 0xfff0;