Updated qemu scripts for updated linux build.

expanded memory from 128MB to 256MB.
This commit is contained in:
Rose Thompson 2023-11-21 13:46:37 -06:00
parent b137759b45
commit f82f7d9323
3 changed files with 9 additions and 6 deletions

View File

@ -1,13 +1,14 @@
#!/bin/bash #!/bin/bash
tcpPort=1235 tcpPort=1235
imageDir=/home/jpease/repos/buildroot3/output/images imageDir=$RISCV/buildroot/output/images
tvDir=linux-testvectors tvDir=$RISCV/linux-testvectors
rawRamFile="$tvDir/ramGDB.bin" rawRamFile="$tvDir/ramGDB.bin"
ramFile="$tvDir/ram.bin" ramFile="$tvDir/ram.bin"
rawBootmemFile="$tvDir/bootmemGDB.bin" rawBootmemFile="$tvDir/bootmemGDB.bin"
bootmemFile="$tvDir/bootmem.bin" bootmemFile="$tvDir/bootmem.bin"
rawUntrimmedBootmemFile="$tvDir/untrimmedBootmemFileGDB.bin" rawUntrimmedBootmemFile="$tvDir/untrimmedBootmemFileGDB.bin"
untrimmedBootmemFile="$tvDir/untrimmedBootmemFile.bin" untrimmedBootmemFile="$tvDir/untrimmedBootmemFile.bin"
DEVICE_TREE=../devicetree/wally-virt.dtb
read -p "Warning: running this script will overwrite the contents of: read -p "Warning: running this script will overwrite the contents of:
* $rawRamFile * $rawRamFile
@ -36,7 +37,7 @@ then
echo "Launching QEMU in replay mode!" echo "Launching QEMU in replay mode!"
(qemu-system-riscv64 \ (qemu-system-riscv64 \
-M virt -dtb /home/jpease/repos/buildroot3/output/images/wally-artya7.dtb \ -M virt -m 256M -dtb $DEVICE_TREE \
-nographic \ -nographic \
-bios $imageDir/fw_jump.elf -kernel $imageDir/Image -append "root=/dev/vda ro" -initrd $imageDir/rootfs.cpio \ -bios $imageDir/fw_jump.elf -kernel $imageDir/Image -append "root=/dev/vda ro" -initrd $imageDir/rootfs.cpio \
-gdb tcp::$tcpPort -S) \ -gdb tcp::$tcpPort -S) \
@ -53,7 +54,7 @@ then
-ex "printf \"Warning - please verify that the second half of $rawUntrimmedBootmemFile is all 0s\n\"" \ -ex "printf \"Warning - please verify that the second half of $rawUntrimmedBootmemFile is all 0s\n\"" \
-ex "dump binary memory $rawUntrimmedBootmemFile 0x1000 0x2fff" \ -ex "dump binary memory $rawUntrimmedBootmemFile 0x1000 0x2fff" \
-ex "printf \"Creating $rawRamFile\n\"" \ -ex "printf \"Creating $rawRamFile\n\"" \
-ex "dump binary memory $rawRamFile 0x80000000 0x87ffffff" \ -ex "dump binary memory $rawRamFile 0x80000000 0x8fffffff" \
-ex "kill" \ -ex "kill" \
-ex "q" -ex "q"

View File

@ -2,6 +2,7 @@
imageDir=$RISCV/buildroot/output/images imageDir=$RISCV/buildroot/output/images
tvDir=$RISCV/linux-testvectors tvDir=$RISCV/linux-testvectors
recordFile="$tvDir/all.qemu" recordFile="$tvDir/all.qemu"
DEVICE_TREE=../devicetree/wally-virt.dtb
read -p "Warning: running this script will overwrite $recordFile read -p "Warning: running this script will overwrite $recordFile
Would you like to proceed? (y/n) " -n 1 -r Would you like to proceed? (y/n) " -n 1 -r
@ -24,7 +25,7 @@ then
echo "Launching QEMU in record mode!" echo "Launching QEMU in record mode!"
qemu-system-riscv64 \ qemu-system-riscv64 \
-M virt -dtb $imageDir/wally-virt.dtb \ -M virt -m 256M -dtb $DEVICE_TREE \
-nographic \ -nographic \
-bios $imageDir/fw_jump.elf -kernel $imageDir/Image -append "root=/dev/vda ro" -initrd $imageDir/rootfs.cpio \ -bios $imageDir/fw_jump.elf -kernel $imageDir/Image -append "root=/dev/vda ro" -initrd $imageDir/rootfs.cpio \
-singlestep -rtc clock=vm -icount shift=0,align=off,sleep=on,rr=record,rrfile=$recordFile -singlestep -rtc clock=vm -icount shift=0,align=off,sleep=on,rr=record,rrfile=$recordFile

View File

@ -6,6 +6,7 @@ recordFile="$tvDir/all.qemu"
traceFile="$tvDir/all.txt" traceFile="$tvDir/all.txt"
trapsFile="$tvDir/traps.txt" trapsFile="$tvDir/traps.txt"
interruptsFile="$tvDir/interrupts.txt" interruptsFile="$tvDir/interrupts.txt"
DEVICE_TREE=../devicetree/wally-virt.dtb
read -p "Warning: running this script will overwrite the contents of: read -p "Warning: running this script will overwrite the contents of:
* $traceFile * $traceFile
@ -36,7 +37,7 @@ then
# QEMU Simulation # QEMU Simulation
echo "Launching QEMU in replay mode!" echo "Launching QEMU in replay mode!"
(qemu-system-riscv64 \ (qemu-system-riscv64 \
-M virt -dtb $imageDir/wally-virt.dtb \ -M virt -m 256M -dtb $DEVICE_TREE \
-nographic \ -nographic \
-bios $imageDir/fw_jump.elf -kernel $imageDir/Image -append "root=/dev/vda ro" -initrd $imageDir/rootfs.cpio \ -bios $imageDir/fw_jump.elf -kernel $imageDir/Image -append "root=/dev/vda ro" -initrd $imageDir/rootfs.cpio \
-singlestep -rtc clock=vm -icount shift=0,align=off,sleep=on,rr=replay,rrfile=$recordFile \ -singlestep -rtc clock=vm -icount shift=0,align=off,sleep=on,rr=replay,rrfile=$recordFile \