refactor: restructure the user space stuff.

[lunaix-os.git] / lunaix-os / debug / gdbstub.c

diff --git a/lunaix-os/debug/gdbstub.c b/lunaix-os/debug/gdbstub.c
index 9546b85800693788888f181892fc75494e98f551..38d35adf0b13e75a56aa771725a0abdb3ce3840d 100644 (file)
--- a/lunaix-os/debug/gdbstub.c
+++ b/lunaix-os/debug/gdbstub.c
@@ -42,8 +42,8 @@
  ****************************************************************************/
 
 #ifndef GDBSTUB_DONT_DEFINE_STDINT_TYPES
-typedef unsigned char uint8_t;
-typedef unsigned short uint16_t;
+typedef unsigned char u8_t;
+typedef unsigned short u16_t;
 typedef unsigned long uint32_t;
 #endif
 
@@ -1176,16 +1176,16 @@ gdb_main(struct gdb_state* state)
 
 struct gdb_idtr
 {
-    uint16_t len;
+    u16_t len;
     uint32_t offset;
 } __attribute__((packed));
 
 struct gdb_idt_gate
 {
-    uint16_t offset_low;
-    uint16_t segment;
-    uint16_t flags;
-    uint16_t offset_high;
+    u16_t offset_low;
+    u16_t segment;
+    u16_t flags;
+    u16_t offset_high;
 } __attribute__((packed));
 
 /*****************************************************************************
@@ -1211,7 +1211,7 @@ void
 gdbstub_loop(isr_param* param)
 {
     /* Translate vector to signal */
-    switch (param->vector) {
+    switch (param->execp->vector) {
         case 1:
             gdb_state.signum = 5;
             break;
@@ -1227,14 +1227,14 @@ gdbstub_loop(isr_param* param)
     gdb_state.registers[GDB_CPU_I386_REG_ECX] = param->registers.ecx;
     gdb_state.registers[GDB_CPU_I386_REG_EDX] = param->registers.edx;
     gdb_state.registers[GDB_CPU_I386_REG_EBX] = param->registers.ebx;
-    gdb_state.registers[GDB_CPU_I386_REG_ESP] = param->registers.esp;
+    gdb_state.registers[GDB_CPU_I386_REG_ESP] = param->esp;
     gdb_state.registers[GDB_CPU_I386_REG_EBP] = param->registers.ebp;
     gdb_state.registers[GDB_CPU_I386_REG_ESI] = param->registers.esi;
     gdb_state.registers[GDB_CPU_I386_REG_EDI] = param->registers.edi;
-    gdb_state.registers[GDB_CPU_I386_REG_PC] = param->eip;
-    gdb_state.registers[GDB_CPU_I386_REG_CS] = param->cs;
-    gdb_state.registers[GDB_CPU_I386_REG_PS] = param->eflags;
-    gdb_state.registers[GDB_CPU_I386_REG_SS] = param->ss;
+    gdb_state.registers[GDB_CPU_I386_REG_PC] = param->execp->eip;
+    gdb_state.registers[GDB_CPU_I386_REG_CS] = param->execp->cs;
+    gdb_state.registers[GDB_CPU_I386_REG_PS] = param->execp->eflags;
+    gdb_state.registers[GDB_CPU_I386_REG_SS] = param->execp->ss;
     gdb_state.registers[GDB_CPU_I386_REG_DS] = param->registers.ds;
     gdb_state.registers[GDB_CPU_I386_REG_ES] = param->registers.es;
     gdb_state.registers[GDB_CPU_I386_REG_FS] = param->registers.fs;
@@ -1247,14 +1247,14 @@ gdbstub_loop(isr_param* param)
     param->registers.ecx = gdb_state.registers[GDB_CPU_I386_REG_ECX];
     param->registers.edx = gdb_state.registers[GDB_CPU_I386_REG_EDX];
     param->registers.ebx = gdb_state.registers[GDB_CPU_I386_REG_EBX];
-    param->registers.esp = gdb_state.registers[GDB_CPU_I386_REG_ESP];
+    param->esp = gdb_state.registers[GDB_CPU_I386_REG_ESP];
     param->registers.ebp = gdb_state.registers[GDB_CPU_I386_REG_EBP];
     param->registers.esi = gdb_state.registers[GDB_CPU_I386_REG_ESI];
     param->registers.edi = gdb_state.registers[GDB_CPU_I386_REG_EDI];
-    param->eip = gdb_state.registers[GDB_CPU_I386_REG_PC];
-    param->cs = gdb_state.registers[GDB_CPU_I386_REG_CS];
-    param->eflags = gdb_state.registers[GDB_CPU_I386_REG_PS];
-    param->ss = gdb_state.registers[GDB_CPU_I386_REG_SS];
+    param->execp->eip = gdb_state.registers[GDB_CPU_I386_REG_PC];
+    param->execp->cs = gdb_state.registers[GDB_CPU_I386_REG_CS];
+    param->execp->eflags = gdb_state.registers[GDB_CPU_I386_REG_PS];
+    param->execp->ss = gdb_state.registers[GDB_CPU_I386_REG_SS];
     param->registers.ds = gdb_state.registers[GDB_CPU_I386_REG_DS];
     param->registers.es = gdb_state.registers[GDB_CPU_I386_REG_ES];
     param->registers.fs = gdb_state.registers[GDB_CPU_I386_REG_FS];