fix vscode launch script and get the breakpoints to work

goodstuff20 · Jan 2, 2021 · bf1eb61 · bf1eb61
1 parent d990a69
commit bf1eb61
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 14 deletions.
diff --git a/README.md b/README.md
@@ -6,6 +6,10 @@ based off https://github.com/jserv/armv8-hello and https://wiki.osdev.org/ARM_Ra
 
 Run a custom kernel on a hardware-emulated raspberry pi 3.
 
+to run qemu-io-test:
+- ./run.sh
+- run Debug QEMU launc configuration
+
 notes:
 - since raspberry pi 4 is not yet supported by qemu raspi3 is running
 - output "Hello World" sometimes looses characters or prints different chars

diff --git a/qemu-IO-test/.vscode/launch.json b/qemu-IO-test/.vscode/launch.json
@@ -5,18 +5,22 @@
     "version": "0.2.0",
     "configurations": [
         {
-            "name": "Debug program",
+            "name": "Debug QEMU",
             "type": "cppdbg",
             "request": "launch",
-            "program": "${workspaceFolder}/build/kernel8.img",
-            "miDebuggerServerAddress": "localhost:9000",
-            "stopAtEntry": true,
-            "cwd": "${workspaceFolder}",
+            "program": "${workspaceRoot}/build/kernel8.img",
+            "miDebuggerServerAddress": "localhost:1234",
+            "args": [],
+            "stopAtEntry": false,
+            "cwd": "${workspaceRoot}",
             "environment": [],
-            "externalConsole": false,
-            "MIMode": "gdb",
-            "miDebuggerPath": "/usr/bin/gdb-multiarch",
-            "preLaunchTask": "Run QEMU",
+            "externalConsole": true,
+            "launchCompleteCommand": "exec-run",
+            "linux": {
+                "MIMode": "gdb",
+                "miDebuggerPath": "/usr/bin/gdb-multiarch"
+            }
+            //"preLaunchTask": "qemu background"
         }
     ]
 }
diff --git a/qemu-IO-test/.vscode/tasks.json b/qemu-IO-test/.vscode/tasks.json
@@ -4,7 +4,7 @@
             "label": "Run QEMU",
             "type": "shell",
             "isBackground": true,
-            "command": "echo Starting QEMU&qemu-system-aarch64 -S -gdb tcp::9000 -M raspi3 -kernel build/kernel8.img --nographic -d int",
+            "command": "echo Starting QEMU&qemu-system-aarch64 -S -gdb tcp::1234 -M raspi3 -kernel build/kernel8.img --nographic -d int",
             "problemMatcher": {
                 "pattern": {
                     "regexp": "^(Starting QEMU)",
@@ -16,7 +16,7 @@
                     "endsPattern": "^(Starting QEMU)"
                 }
             }
-        },
+        }
     ],
     "version": "2.0.0"
 }
diff --git a/qemu-IO-test/Makefile b/qemu-IO-test/Makefile
@@ -7,8 +7,8 @@ KERNEL_FILE = kernel8.img
          -march=armv8-a \
 		 -Iinclude
 # -mgeneral-regs-only
-CFLAGS = -Wall -nostdlib -nostartfiles -ffreestanding -Iinclude -mgeneral-regs-only
-SFLAGS = -Iinclude
+CFLAGS = -Wall -nostdlib -nostartfiles -ffreestanding -Iinclude -mgeneral-regs-only -g
+SFLAGS = -Iinclude -g
 
 C_FILES = $(wildcard src/*.c)
 S_FILES = $(wildcard src/*.S)

diff --git a/qemu-IO-test/run.sh b/qemu-IO-test/run.sh
@@ -1,4 +1,4 @@
 #!/bin/bash
 echo "Press Ctrl-A and then X to exit QEMU"
 echo
-qemu-system-aarch64 -M raspi3 -kernel build/kernel8.img --nographic -d int
+qemu-system-aarch64 -S -M raspi3 -kernel build/kernel8.img --nographic -gdb tcp::1234