Changeset 23d22eb in mainline for arch/amd64/src

Timestamp:

2006-03-17T11:55:43Z (20 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

bd72b475

Parents:

4e49572

Message:

Ported AMD64 debugger to ia32 and enabled AS watchpoint to ia32 as well.

Location:

arch/amd64/src

Files:

• debugger.c (modified) (3 diffs)
• proc/scheduler.c (modified) (1 diff)

arch/amd64/src/debugger.c

@@ -192 +192 @@
 }
 
+#ifdef amd64
+# define getip(x)  ((x)->rip)
+#else
+# define getip(x)  ((x)->eip)
+#endif
+
 static void handle_exception(int slot, istate_t *istate)
 {
@@ -208 +214 @@
                 }
         }
-        printf("Reached breakpoint %d:%P(%s)\n", slot, istate->rip,
-               get_symtab_entry(istate->rip));
+        printf("Reached breakpoint %d:%P(%s)\n", slot, getip(istate),
+               get_symtab_entry(getip(istate)));
         printf("***Type 'exit' to exit kconsole.\n");
         atomic_set(&haltstate,1);
@@ -222 +228 @@
         
         /* Set RF to restart the instruction  */
+#ifdef amd64       
         istate->rflags |= RFLAGS_RF;
+#else
+        istate->eflags |= EFLAGS_RF;
+#endif
 
         dr6 = read_dr6();

arch/amd64/src/proc/scheduler.c

@@ -39 +39 @@
         CPU->arch.tss->rsp0 = (__address) &THREAD->kstack[THREAD_STACK_SIZE-SP_DELTA];
 
-        /* Syscall support - write thread address to hidden part of gs */
+        /* Syscall support - write thread stack address to hidden part of gs */
         swapgs();
         write_msr(AMD_MSR_GS,