summaryrefslogtreecommitdiff
path: root/src/arch/amd64/cpu
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/arch/amd64/cpu/backtrace.c (renamed from src/arch/amd64/backtrace.c)0
-rw-r--r--src/arch/amd64/cpu/debugger.c (renamed from src/arch/amd64/debugger.c)5
-rw-r--r--src/arch/amd64/cpu/debugger.h (renamed from src/arch/amd64/debugger.h)2
-rw-r--r--src/arch/amd64/cpu/idt.S (renamed from src/arch/amd64/idt.S)0
-rw-r--r--src/arch/amd64/cpu/idt.c (renamed from src/arch/amd64/idt.c)9
-rw-r--r--src/arch/amd64/cpu/idt.h (renamed from src/arch/amd64/idt.h)0
6 files changed, 8 insertions, 8 deletions
diff --git a/src/arch/amd64/backtrace.c b/src/arch/amd64/cpu/backtrace.c
index 9e1c9d7..9e1c9d7 100644
--- a/src/arch/amd64/backtrace.c
+++ b/src/arch/amd64/cpu/backtrace.c
diff --git a/src/arch/amd64/debugger.c b/src/arch/amd64/cpu/debugger.c
index a1fa968..4d9d3c3 100644
--- a/src/arch/amd64/debugger.c
+++ b/src/arch/amd64/cpu/debugger.c
@@ -2,6 +2,7 @@
#include <stddef.h>
#include <backtrace.h>
#include <serial.h>
+
#include "debugger.h"
struct dr6 {
@@ -195,8 +196,8 @@ static int debugger_handle_bkp_cmd(char *msg) {
const char *lenstrs[] = {"1", "2", "8", "4"};
const char *rwstrs[] = {"x ", "w ", "io", "rw"};
kprintf(
- "breakpoint %d: %#016lx len=%s trigger=%s instrlen=%01d %s\n",
- i,
+ "breakpoint %d: %#016lx len=%s trigger=%s instrlen=%01d %s\n",
+ i,
bkp.addr,
lenstrs[bkp.len],
rwstrs[bkp.rw],
diff --git a/src/arch/amd64/debugger.h b/src/arch/amd64/cpu/debugger.h
index e679c07..14f73bf 100644
--- a/src/arch/amd64/debugger.h
+++ b/src/arch/amd64/cpu/debugger.h
@@ -3,7 +3,7 @@
#include "idt.h"
#define DEBUG_INT3 0x00
-#define DEBUG_DBG 0x01
+#define DEBUG_DBG 0x01
#define DEBUG_FAULT 0x02
void debugger(struct isr_regs *state, int cause);
diff --git a/src/arch/amd64/idt.S b/src/arch/amd64/cpu/idt.S
index cd8783e..cd8783e 100644
--- a/src/arch/amd64/idt.S
+++ b/src/arch/amd64/cpu/idt.S
diff --git a/src/arch/amd64/idt.c b/src/arch/amd64/cpu/idt.c
index d33c795..053f614 100644
--- a/src/arch/amd64/idt.c
+++ b/src/arch/amd64/cpu/idt.c
@@ -2,10 +2,10 @@
#include <stddef.h>
#include <lib.h>
#include <panic.h>
-
-#include "debugger.h"
#include "idt.h"
-#include "pic.h"
+#include "debugger.h"
+#include "../paging.h"
+#include "../drivers/pic.h"
#define IDT_SIZE 256
@@ -148,7 +148,7 @@ void idt_pic_timer(void) {
// print a message once we know the timer works
// but avoid spamming the logs
if (counter == 3) {
- kputs("pic timer!\n");
+ //kputs("pic timer!\n");
}
if (counter <= 3) {
counter++;
@@ -158,4 +158,3 @@ void idt_pic_timer(void) {
void idt_pic_keyboard(void) {}
void idt_pic_mouse(void) {}
-
diff --git a/src/arch/amd64/idt.h b/src/arch/amd64/cpu/idt.h
index 89a9dab..89a9dab 100644
--- a/src/arch/amd64/idt.h
+++ b/src/arch/amd64/cpu/idt.h