Emulation/Zookeeper
1
0
Fork 0
mirror of https://github.com/daeken/Zookeeper.git synced 2024-05-29 01:57:41 -04:00
Code Issues Packages Projects Releases Wiki Activity

Began refactoring for libretto.

Browse source
This commit is contained in:
Cody Brocious 2016-06-04 15:29:30 -06:00
parent f19e191cbb
commit f91e74ef2b
4 changed files with 22 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Box.cpp
View file

@ -4,11 +4,8 @@ Box *box;
Box::Box() { Box::Box() {
box = this; box = this;
uint8_t *mem, *kmem;
bailout(!(mem = (uint8_t *) valloc(RAM_SIZE)));
bailout(!(kmem = (uint8_t *) valloc(KRAM_SIZE)));
cpu = new Cpu(mem, kmem); cpu = new Cpu();
hypercall = new Hypercall(); hypercall = new Hypercall();
hm = new HandleManager(); hm = new HandleManager();

1
Box.hpp
View file

@ -26,6 +26,7 @@ public:
map<uint32_t, Device *> pci; map<uint32_t, Device *> pci;
uint32_t xbebase; uint32_t xbebase;
bool frame_rendered = false; // Trigger return from cpu
}; };
extern Box *box; extern Box *box;

28
Cpu.cpp
View file

@ -20,9 +20,9 @@ void gdt_encode(uint8_t *gdt, int entry, uint32_t base, uint32_t limit, uint8_t
gdt[5] = type; gdt[5] = type;
} }
Cpu::Cpu(uint8_t *ram, uint8_t *kram) { Cpu::Cpu() {
mem = ram; bailout(!(mem = (uint8_t *) valloc(RAM_SIZE)));
kmem = kram; bailout(!(kmem = (uint8_t *) valloc(KRAM_SIZE)));
hv = new HVImpl(); hv = new HVImpl();
memset(mem, 0, RAM_SIZE); memset(mem, 0, RAM_SIZE);
@ -41,7 +41,7 @@ Cpu::Cpu(uint8_t *ram, uint8_t *kram) {
hv->reg(CR3, directory); hv->reg(CR3, directory);
hv->reg(CR0, 0x80000000 | 0x20 | 0x01); // Paging | NE | PE hv->reg(CR0, 0x80000000 | 0x20 | 0x01); // Paging | NE | PE
auto gdt = ram + 96*ONE_MB; auto gdt = mem + 96*ONE_MB;
memset(gdt, 0, 0x10000); memset(gdt, 0, 0x10000);
gdt_encode(gdt, 0, 0, 0, 0); // Null entry gdt_encode(gdt, 0, 0, 0, 0); // Null entry
gdt_encode(gdt, 1, 0, 0xffffffff, 0x9A); // Code gdt_encode(gdt, 1, 0, 0xffffffff, 0x9A); // Code
@ -148,13 +148,15 @@ uint64_t systime() {
return (time.tv_sec * 1000) + (time.tv_usec / 1000); return (time.tv_sec * 1000) + (time.tv_usec / 1000);
} }
void Cpu::run(uint32_t eip) { bool Cpu::run(uint32_t eip) {
hv->reg(EIP, eip); if(eip != -1) {
hv->reg(EFLAGS, 0x2); hv->reg(EIP, eip);
hv->reg(EFLAGS, 0x2);
box->debugger->enter(0); box->debugger->enter(0);
auto last_time = systime(); last_time = systime();
}
auto swap = true; auto swap = true;
uint32_t in_mmio; uint32_t in_mmio;
@ -309,6 +311,10 @@ void Cpu::run(uint32_t eip) {
last_time = cur_time; last_time = cur_time;
} }
} }
} while(!stop); } while(!stop && !box->frame_rendered);
box->debugger->enter(); if(stop) { // No debugger on frame render
box->debugger->enter();
return false;
}
return true;
} }

5
Cpu.hpp
View file

@ -4,9 +4,9 @@
class Cpu { class Cpu {
public: public:
Cpu(uint8_t *ram, uint8_t *kram); Cpu();
~Cpu(); ~Cpu();
void run(uint32_t eip); bool run(uint32_t eip=-1);
void map_pages(uint32_t virt, uint32_t phys, uint32_t count, bool present=true); void map_pages(uint32_t virt, uint32_t phys, uint32_t count, bool present=true);
void flip_page(uint32_t base, bool val); void flip_page(uint32_t base, bool val);
@ -33,4 +33,5 @@ public:
int single_step = 0; int single_step = 0;
bool stop = false; bool stop = false;
bool do_break_in = false; bool do_break_in = false;
uint64_t last_time;
}; };