From 13d6b2a037b3c3c46f763313d0f913a67ed8559b Mon Sep 17 00:00:00 2001 From: Berkus Decker Date: Sun, 23 Jul 2023 18:28:32 +0300 Subject: [PATCH] =?UTF-8?q?chore:=20=E2=99=BB=EF=B8=8F=20Add=20QEMU=20trac?= =?UTF-8?q?ing=20options=20for=20aarch64?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Disabled for now, need to try them out. --- Makefile.toml | 5 ++++- nucleus/Makefile.toml | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Makefile.toml b/Makefile.toml index 61a6ca5..5ec097b 100644 --- a/Makefile.toml +++ b/Makefile.toml @@ -63,7 +63,10 @@ QEMU_CONTAINER_CMD = "qemu-system-aarch64" # # QEMU has renamed the RasPi machines since version 6.2.0, use just `raspi3` for previous versions. QEMU_OPTS = "-M ${QEMU_MACHINE} -d int -semihosting" -QEMU_DISASM_OPTS = "-d in_asm,unimp,int" +QEMU_ARM_TRACE_OPTS = "arm_gt_cntvoff_write,arm_gt_ctl_write,arm_gt_cval_write,arm_gt_imask_toggle,arm_gt_recalc,arm_gt_recalc_disabled,arm_gt_tval_write,armsse_cpu_pwrctrl_read,armsse_cpu_pwrctrl_write,armsse_cpuid_read,armsse_cpuid_write,armsse_mhu_read,armsse_mhu_write" +QEMU_BCM_TRACE_OPTS = "bcm2835_cprman_read,bcm2835_cprman_write,bcm2835_cprman_write_invalid_magic,bcm2835_ic_set_cpu_irq,bcm2835_ic_set_gpu_irq,bcm2835_mbox_irq,bcm2835_mbox_property,bcm2835_mbox_read,bcm2835_mbox_write,bcm2835_sdhost_edm_change,bcm2835_sdhost_read,bcm2835_sdhost_update_irq,bcm2835_sdhost_write,bcm2835_systmr_irq_ack,bcm2835_systmr_read,bcm2835_systmr_run,bcm2835_systmr_timer_expired,bcm2835_systmr_write" +QEMU_TRACE_OPTS = "trace:${QEMU_ARM_TRACE_OPTS},${QEMU_BCM_TRACE_OPTS}" # @todo trace: prefix for each opt +QEMU_DISASM_OPTS = "-d in_asm,unimp,int,mmu,cpu_reset,guest_errors,nochain,plugin" QEMU_SERIAL_OPTS = "-serial pty -serial stdio" QEMU_TESTS_OPTS = "-nographic" # For gdb connection: diff --git a/nucleus/Makefile.toml b/nucleus/Makefile.toml index efd857d..73c0742 100644 --- a/nucleus/Makefile.toml +++ b/nucleus/Makefile.toml @@ -8,7 +8,7 @@ env = { "BINARY_FILE" = "${KERNEL_ELF}" } run_task = "custom-binary" [tasks.qemu] -env = { "QEMU_RUNNER_OPTS" = "${QEMU_SERIAL_OPTS}", "TARGET_DTB" = "${CARGO_MAKE_WORKSPACE_WORKING_DIRECTORY}/targets/bcm2710-rpi-3-b-plus.dtb" } +env = { "QEMU_RUNNER_OPTS" = "${QEMU_SERIAL_OPTS} ${QEMU_DISASM_OPTS}", "TARGET_DTB" = "${CARGO_MAKE_WORKSPACE_WORKING_DIRECTORY}/targets/bcm2710-rpi-3-b-plus.dtb" } extend = "qemu-runner" disabled = false @@ -16,7 +16,7 @@ disabled = false disabled = true [tasks.qemu-gdb] -env = { "QEMU_RUNNER_OPTS" = "${QEMU_SERIAL_OPTS} ${QEMU_GDB_OPTS}", "TARGET_DTB" = "${CARGO_MAKE_WORKSPACE_WORKING_DIRECTORY}/targets/bcm2710-rpi-3-b-plus.dtb" } +env = { "QEMU_RUNNER_OPTS" = "${QEMU_SERIAL_OPTS} ${QEMU_DISASM_OPTS} ${QEMU_GDB_OPTS}", "TARGET_DTB" = "${CARGO_MAKE_WORKSPACE_WORKING_DIRECTORY}/targets/bcm2710-rpi-3-b-plus.dtb" } extend = "qemu-runner" [tasks.qemu-cb-gdb]