X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fgeekos%2Fmain.c;h=706665fc5ef498cd8df63c40351b2912df321651;hb=a6b18965e0ab6c3a0f2950c684892052194c1c58;hp=87bea697c760257709da6ce51ef28366dd65d646;hpb=04fc4c8fbac29e04f0d0817a2906687c2c972559;p=palacios-OLD.git diff --git a/palacios/src/geekos/main.c b/palacios/src/geekos/main.c index 87bea69..706665f 100644 --- a/palacios/src/geekos/main.c +++ b/palacios/src/geekos/main.c @@ -3,7 +3,7 @@ * Copyright (c) 2001,2003,2004 David H. Hovemeyer * Copyright (c) 2003, Jeffrey K. Hollingsworth * Copyright (c) 2004, Iulian Neamtiu - * $Revision: 1.18 $ + * $Revision: 1.38 $ * * This is free software. You are permitted to use, * redistribute, and modify it as specified in the file "COPYING". @@ -29,28 +29,21 @@ #include #include -#include -#include +#include +#include #include +#include -extern void Get_MSR(ulong_t msr, unsigned int *val1, unsigned int *val2); -extern void Set_MSR(ulong_t msr, ulong_t val1, ulong_t val2); -extern uint_t Get_EIP(); -extern uint_t Get_ESP(); -extern uint_t Get_EBP(); - - -int foo=42; - #define SPEAKER_PORT 0x61 + void Buzz(unsigned delay, unsigned num) { volatile int x; @@ -97,44 +90,6 @@ inline uchar_t MyIn_Byte(ushort_t port) } -extern void MyBuzzVM(); - -#define MYBUZZVM_START MyBuzzVM -#define MYBUZZVM_LEN 0x3d - -void BuzzVM() -{ - int x; - int j; - unsigned char init; - - - SerialPrint("Starting To Buzz\n"); - - init=MyIn_Byte(SPEAKER_PORT); - - while (1) { - MyOut_Byte(SPEAKER_PORT, init|0x2); - for (j=0;j<1000000;j++) { - x+=j; - } - MyOut_Byte(SPEAKER_PORT, init); - for (j=0;j<1000000;j++) { - x+=j; - } - } -} - -extern void RunVM(); - -int vmRunning = 0; - -void RunVM() { - vmRunning = 1; - - while(1); -} - @@ -219,17 +174,14 @@ int AllocateAndMapPagesForRange(uint_t start, uint_t length, pte_t template_pte) */ void Main(struct Boot_Info* bootInfo) { - struct Kernel_Thread * key_thread; - struct Kernel_Thread * spkr_thread; - // struct Kernel_Thread * vm_thread; - // struct VMDescriptor vm; - ulong_t doIBuzz = 0; + + Out_Byte(0x1234,5); + Out_Byte(0x1234,5); Init_BSS(); Init_Screen(); - Init_Serial(); Init_Mem(bootInfo); Init_CRC32(); @@ -241,16 +193,20 @@ void Main(struct Boot_Info* bootInfo) Init_Keyboard(); Init_VM(bootInfo); Init_Paging(); + + Init_PCI(); + + Init_Stubs(); // Init_IDE(); - Print("Done; stalling\n"); + // Print("Done; stalling\n"); #if 0 - SerialPrint("Dumping VM kernel Code (first 512 bytes @ 0x%x)\n",VM_KERNEL_START); - SerialMemDump((unsigned char *)VM_KERNEL_START, 512); + SerialPrint("Dumping VM kernel Code (first 128 bytes @ 0x%x)\n", 0x100000); + SerialMemDump((unsigned char *)0x100000, 256); /* SerialPrint("Dumping kernel Code (first 512 bytes @ 0x%x)\n",KERNEL_START); SerialMemDump((unsigned char *)VM_KERNEL_START, 512); @@ -258,99 +214,37 @@ void Main(struct Boot_Info* bootInfo) #endif #if 0 - SerialPrint("Dumping GUEST KERNEL CODE (first 512*2 bytes @ 0x100000)\n"); - SerialMemDump((unsigned char *)0x100000, 512*2); -#endif - - key_thread = Start_Kernel_Thread(Keyboard_Listener, (ulong_t)&doIBuzz, PRIORITY_NORMAL, false); - spkr_thread = Start_Kernel_Thread(Buzzer, (ulong_t)&doIBuzz, PRIORITY_NORMAL, false); - - { - struct vmm_os_hooks os_hooks; - struct vmm_ctrl_ops vmm_ops; - guest_info_t vm_info; - addr_t rsp; - addr_t rip; - - memset(&os_hooks, 0, sizeof(struct vmm_os_hooks)); - memset(&vmm_ops, 0, sizeof(struct vmm_ctrl_ops)); - memset(&vm_info, 0, sizeof(guest_info_t)); - - os_hooks.print_debug = &PrintBoth; - os_hooks.print_info = &Print; - os_hooks.print_trace = &SerialPrint; - os_hooks.allocate_pages = &Allocate_VMM_Pages; - os_hooks.free_page = &Free_VMM_Page; - os_hooks.malloc = &VMM_Malloc; - os_hooks.free = &VMM_Free; - - - Init_VMM(&os_hooks, &vmm_ops); - - - init_mem_layout(&(vm_info.mem_layout)); - init_mem_list(&(vm_info.mem_list)); - - - add_mem_list_pages(&(vm_info.mem_list), vm_range_start, (vm_range_end - vm_range_start) / PAGE_SIZE); - // add_unmapped_mem_range(&(vm_info.mem_layout), 0, 256); - //add_shared_mem_range(&(vm_info.mem_layout), guest_kernel_start, (guest_kernel_end - guest_kernel_start) / PAGE_SIZE, guest_kernel_start); - //add_guest_mem_range(&(vm_info.mem_layout), guest_kernel_end, 20); - add_shared_mem_range(&(vm_info.mem_layout), 0, 0x1000000, 0); + struct Kernel_Thread * key_thread; + struct Kernel_Thread * spkr_thread; - rip = (ulong_t)(void*)&BuzzVM; - vm_info.rip = rip; - rsp = (ulong_t)Alloc_Page(); - vm_info.rsp = rsp; + ulong_t doIBuzz = 0; + SerialPrint("Dumping BIOS code ffff0-fffff\n\n"); + SerialMemDump((unsigned char *)0x10fff0, 16); + /* + SerialPrint("Dumping kernel Code (first 512 bytes @ 0x%x)\n",KERNEL_START); + SerialMemDump((unsigned char *)VM_KERNEL_START, 512); + */ - SerialPrint("Initializing Guest (eip=0x%.8x) (esp=0x%.8x)\n", rip, rsp); - (vmm_ops).init_guest(&vm_info); - SerialPrint("Starting Guest\n"); - (vmm_ops).start_guest(&vm_info); - + SerialPrint("Noisemaker and keyboard listener threads\n"); + key_thread = Start_Kernel_Thread(Keyboard_Listener, (ulong_t)&doIBuzz, PRIORITY_NORMAL, false); + spkr_thread = Start_Kernel_Thread(Buzzer, (ulong_t)&doIBuzz, PRIORITY_NORMAL, false); } +#endif + { + RunVMM(bootInfo); + } - SerialPrintLevel(1000,"Launching Noisemaker and keyboard listener threads\n"); - - - - - - - - /* - // jump into vmxassist - vm.entry_ip=(uint_t)0x00107fd0; - vm.exit_eip=0; - // Put the stack at 512K - vm.guest_esp=(uint_t)4096 + 8192 - 4; - *(unsigned int *)(vm.guest_esp) = 1024 * 1024; - vm.guest_esp -= 4; - *(unsigned int *)(vm.guest_esp) = 8; - vm.guest_esp -= 4; - *(unsigned int *)(vm.guest_esp) = vm.guest_esp + 4;; - vm.guest_esp -= 4; - *(unsigned int *)(vm.guest_esp) = vm.entry_ip; - // vm.guest_esp -= 4; - - - SerialMemDump((unsigned char *)vm.entry_ip, 512); - */ - - // vm_thread = Start_Kernel_Thread(VM_Thread, (ulong_t)&vm,PRIORITY_NORMAL,false); - - - SerialPrintLevel(1000,"Next: setup GDT\n"); + SerialPrint("RunVMM returned, spinning\n"); + while (1) {} TODO("Write a Virtual Machine Monitor"); - - /* Now this thread is done. */ + Exit(0); }