Commit e61fb400 by malcolm

removed some output

parent 63d7197e
Showing with 11 additions and 14 deletions
...@@ -45,28 +45,14 @@ void load_error_handlers() ...@@ -45,28 +45,14 @@ void load_error_handlers()
void default_handler(struct reg_state reg, uint32_t interrupt, uint32_t error, struct stack_state stack) void default_handler(struct reg_state reg, uint32_t interrupt, uint32_t error, struct stack_state stack)
{ {
/*for(uint32_t i=stack.eip-16;i<=stack.eip+16;i+=4)
{
serial_hexword(i);
serial_writestring(": ");
serial_hexword(*((uint32_t*)(void*)i));
serial_writestring("\n");
}*/
if(interrupt<32) if(interrupt<32)
stack.eip+=2; stack.eip+=2;
//serial_writestring("int caught ");
//char f[20]; //char f[20];
//serial_val(interrupt); //serial_val(interrupt);
//serial_hexword(error);serial_writestring(" ");
//serial_hexword(stack.eip);serial_writestring(" ");
//serial_val(stack.cd);
//serial_val(stack.eflags);
//serial_writestring("\n");
if(handlers[interrupt]!=NULL) if(handlers[interrupt]!=NULL)
{ {
handlers[interrupt](error); handlers[interrupt](error);
} }
//asm("hlt");
return; return;
} }
......
...@@ -99,6 +99,17 @@ void terminal_putchar(char c) ...@@ -99,6 +99,17 @@ void terminal_putchar(char c)
update_csr(); update_csr();
} }
const char* hexcharss = "0123456789abcdef";
void terminal_hexstring(void* s, uint32_t n) {
char* d = (char*)s;
for (uint32_t i = 0; i < n; i++)
{
terminal_putchar(hexcharss[(d[i]>>4)&0xf]);
terminal_putchar(hexcharss[d[i]&0xf]);
}
}
void terminal_writestring(const char* data) void terminal_writestring(const char* data)
{ {
size_t datalen = strlen(data); size_t datalen = strlen(data);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment