RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 21:57:43 +00:00
Code Issues Activity Actions

Run QEMU with the possibility to attach gdb.

Browse source
This commit is contained in:
Andreas Kling 2018-11-09 18:35:17 +01:00
parent 985074c790
commit de38e63d3e
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Kernel/Process.cpp
View file

@ -28,7 +28,7 @@
// FIXME: Some places pass strlen(arg1) as arg2. This doesn't seem entirely perfect.. // FIXME: Some places pass strlen(arg1) as arg2. This doesn't seem entirely perfect..
#define VALIDATE_USER_READ_WITH_RETURN_TYPE(b, s, ret_type) \ #define VALIDATE_USER_READ_WITH_RETURN_TYPE(b, s, ret_type) \
do { \ do { \
LinearAddress laddr((dword)(b)); \ LinearAddress laddr(reinterpret_cast<dword>(b)); \
if (!validate_user_read(laddr) || !validate_user_read(laddr.offset((s) - 1))) { \ if (!validate_user_read(laddr) || !validate_user_read(laddr.offset((s) - 1))) { \
dbgprintf("Bad read address passed to syscall: %p +%u\n", laddr.get(), (s)); \ dbgprintf("Bad read address passed to syscall: %p +%u\n", laddr.get(), (s)); \
return (ret_type)-EFAULT; \ return (ret_type)-EFAULT; \
@ -39,7 +39,7 @@
#define VALIDATE_USER_WRITE(b, s) \ #define VALIDATE_USER_WRITE(b, s) \
do { \ do { \
LinearAddress laddr((dword)(b)); \ LinearAddress laddr(reinterpret_cast<dword>(b)); \
if (!validate_user_write(laddr) || !validate_user_write(laddr.offset((s) - 1))) { \ if (!validate_user_write(laddr) || !validate_user_write(laddr.offset((s) - 1))) { \
dbgprintf("Bad write address passed to syscall: %p +%u\n", laddr.get(), (s)); \ dbgprintf("Bad write address passed to syscall: %p +%u\n", laddr.get(), (s)); \
return -EFAULT; \ return -EFAULT; \

2
Kernel/run
View file

@ -3,6 +3,6 @@
if [ "$1" = "b" ]; then if [ "$1" = "b" ]; then
bochs -q -f .bochsrc bochs -q -f .bochsrc
else else
qemu-system-i386 -m 32 -drive format=raw,file=.floppy-image,if=floppy -drive format=raw,file=_fs_contents #$@ qemu-system-i386 -s -m 32 -drive format=raw,file=.floppy-image,if=floppy -drive format=raw,file=_fs_contents #$@
fi fi