Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added -S flag to qemu-system-i386 in make debug #209

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion 14-checkpoint/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ run: os-image.bin

# Open the connection to qemu and load our kernel-object file with symbols
debug: os-image.bin kernel.elf
qemu-system-i386 -s -fda os-image.bin &
qemu-system-i386 -s -S -fda os-image.bin &
${GDB} -ex "target remote localhost:1234" -ex "symbol-file kernel.elf"

# Generic rules for wildcards
Expand Down
2 changes: 1 addition & 1 deletion 15-video-ports/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ run: os-image.bin

# Open the connection to qemu and load our kernel-object file with symbols
debug: os-image.bin kernel.elf
qemu-system-i386 -s -fda os-image.bin &
qemu-system-i386 -s -S -fda os-image.bin &
${GDB} -ex "target remote localhost:1234" -ex "symbol-file kernel.elf"

# Generic rules for wildcards
Expand Down
2 changes: 1 addition & 1 deletion 16-video-driver/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ run: os-image.bin

# Open the connection to qemu and load our kernel-object file with symbols
debug: os-image.bin kernel.elf
qemu-system-i386 -s -fda os-image.bin &
qemu-system-i386 -s -S -fda os-image.bin &
${GDB} -ex "target remote localhost:1234" -ex "symbol-file kernel.elf"

# Generic rules for wildcards
Expand Down
2 changes: 1 addition & 1 deletion 17-video-scroll/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ run: os-image.bin

# Open the connection to qemu and load our kernel-object file with symbols
debug: os-image.bin kernel.elf
qemu-system-i386 -s -fda os-image.bin &
qemu-system-i386 -s -S -fda os-image.bin &
${GDB} -ex "target remote localhost:1234" -ex "symbol-file kernel.elf"

# Generic rules for wildcards
Expand Down
2 changes: 1 addition & 1 deletion 18-interrupts/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ run: os-image.bin

# Open the connection to qemu and load our kernel-object file with symbols
debug: os-image.bin kernel.elf
qemu-system-i386 -s -fda os-image.bin -d guest_errors,int &
qemu-system-i386 -s -S -fda os-image.bin -d guest_errors,int &
${GDB} -ex "target remote localhost:1234" -ex "symbol-file kernel.elf"

# Generic rules for wildcards
Expand Down
3 changes: 3 additions & 0 deletions 18-interrupts/cpu/idt.c
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
#include "idt.h"
#include "../kernel/util.h"

idt_gate_t idt[IDT_ENTRIES];
idt_register_t idt_reg;

void set_idt_gate(int n, u32 handler) {
idt[n].low_offset = low_16(handler);
idt[n].sel = KERNEL_CS;
Expand Down
2 changes: 0 additions & 2 deletions 18-interrupts/cpu/idt.h
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,6 @@ typedef struct {
} __attribute__((packed)) idt_register_t;

#define IDT_ENTRIES 256
idt_gate_t idt[IDT_ENTRIES];
idt_register_t idt_reg;


/* Functions implemented in idt.c */
Expand Down
2 changes: 1 addition & 1 deletion 19-interrupts-irqs/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ run: os-image.bin

# Open the connection to qemu and load our kernel-object file with symbols
debug: os-image.bin kernel.elf
qemu-system-i386 -s -fda os-image.bin -d guest_errors,int &
qemu-system-i386 -s -S -fda os-image.bin -d guest_errors,int &
${GDB} -ex "target remote localhost:1234" -ex "symbol-file kernel.elf"

# Generic rules for wildcards
Expand Down
2 changes: 1 addition & 1 deletion 20-interrupts-timer/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ run: os-image.bin

# Open the connection to qemu and load our kernel-object file with symbols
debug: os-image.bin kernel.elf
qemu-system-i386 -s -fda os-image.bin -d guest_errors,int &
qemu-system-i386 -s -S -fda os-image.bin -d guest_errors,int &
${GDB} -ex "target remote localhost:1234" -ex "symbol-file kernel.elf"

# Generic rules for wildcards
Expand Down
2 changes: 1 addition & 1 deletion 21-shell/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ run: os-image.bin

# Open the connection to qemu and load our kernel-object file with symbols
debug: os-image.bin kernel.elf
qemu-system-i386 -s -fda os-image.bin -d guest_errors,int &
qemu-system-i386 -s -S -fda os-image.bin -d guest_errors,int &
${GDB} -ex "target remote localhost:1234" -ex "symbol-file kernel.elf"

# Generic rules for wildcards
Expand Down
2 changes: 1 addition & 1 deletion 22-malloc/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ run: os-image.bin

# Open the connection to qemu and load our kernel-object file with symbols
debug: os-image.bin kernel.elf
qemu-system-i386 -s -fda os-image.bin -d guest_errors,int &
qemu-system-i386 -s -S -fda os-image.bin -d guest_errors,int &
${GDB} -ex "target remote localhost:1234" -ex "symbol-file kernel.elf"

# Generic rules for wildcards
Expand Down
2 changes: 1 addition & 1 deletion 23-fixes/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ run: os-image.bin

# Open the connection to qemu and load our kernel-object file with symbols
debug: os-image.bin kernel.elf
qemu-system-i386 -s -fda os-image.bin -d guest_errors,int &
qemu-system-i386 -s -S -fda os-image.bin -d guest_errors,int &
${GDB} -ex "target remote localhost:1234" -ex "symbol-file kernel.elf"

# Generic rules for wildcards
Expand Down