Simplify genInitMem.sh using qemuBoot.sh

This commit is contained in:
Jordan Carlin 2025-01-20 19:16:55 -08:00
parent ff026540ff
commit acf886651e
No known key found for this signature in database
2 changed files with 16 additions and 25 deletions

View File

@ -1,14 +1,12 @@
#!/bin/bash #!/bin/bash
set -e set -e
tcpPort=1235 tcpPort=1235
imageDir=$RISCV/buildroot/output/images
tvDir=$RISCV/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"
DEVICE_TREE=${imageDir}/wally-virt.dtb
if ! mkdir -p "$tvDir"; then if ! mkdir -p "$tvDir"; then
echo "Error: unable to create linux testvector directory $tvDir!">&2 echo "Error: unable to create linux testvector directory $tvDir!">&2
@ -26,24 +24,15 @@ if ! test -w "$tvDir"; then
fi fi
echo "Launching QEMU in replay mode!" echo "Launching QEMU in replay mode!"
(qemu-system-riscv64 \ ./qemuBoot.sh --gdb $tcpPort &
-M virt -m 256M -dtb "$DEVICE_TREE" \ riscv64-unknown-elf-gdb -batch \
-nographic \ -ex "target remote :$tcpPort" \
-bios "$imageDir"/fw_jump.bin -kernel "$imageDir"/Image -append "root=/dev/vda ro" -initrd "$imageDir"/rootfs.cpio \ -ex "maintenance packet Qqemu.PhyMemMode:1" \
-gdb tcp::$tcpPort -S) \ -ex "printf \"Creating $rawBootmemFile\n\"" \
& riscv64-unknown-elf-gdb --quiet \ -ex "dump binary memory $rawBootmemFile 0x1000 0x1fff" \
-ex "set pagination off" \ -ex "printf \"Creating $rawRamFile\n\"" \
-ex "set logging overwrite on" \ -ex "dump binary memory $rawRamFile 0x80000000 0x8fffffff" \
-ex "set logging redirect on" \ -ex "kill" \
-ex "set confirm off" \
-ex "target extended-remote :$tcpPort" \
-ex "maintenance packet Qqemu.PhyMemMode:1" \
-ex "printf \"Creating $rawBootmemFile\n\"" \
-ex "dump binary memory $rawBootmemFile 0x1000 0x1fff" \
-ex "printf \"Creating $rawRamFile\n\"" \
-ex "dump binary memory $rawRamFile 0x80000000 0x8fffffff" \
-ex "kill" \
-ex "q"
echo "Changing Endianness" echo "Changing Endianness"
# Extend files to 8 byte multiple # Extend files to 8 byte multiple
@ -55,7 +44,3 @@ objcopy --reverse-bytes=8 -F binary "$rawBootmemFile" "$bootmemFile"
rm -f "$rawRamFile" "$rawBootmemFile" "$rawUntrimmedBootmemFile" rm -f "$rawRamFile" "$rawBootmemFile" "$rawUntrimmedBootmemFile"
echo "genInitMem.sh completed!" echo "genInitMem.sh completed!"
echo "You may want to restrict write access to $tvDir now and give cad ownership of it."
echo "Run the following:"
echo " sudo chown -R cad:cad $tvDir"
echo " sudo chmod -R go-w $tvDir"

View File

@ -1,10 +1,16 @@
#!/bin/bash #!/bin/bash
BUILDROOT="${BUILDROOT:-$RISCV/buildroot}" BUILDROOT="${BUILDROOT:-$RISCV/buildroot}"
IMAGES="$BUILDROOT"/output/images IMAGES="$BUILDROOT"/output/images
if [[ "$1" == "--gdb" && -n "$2" ]]; then
GDB_FLAG="-gdb tcp::$2 -S"
fi
qemu-system-riscv64 \ qemu-system-riscv64 \
-M virt -m 256M -nographic \ -M virt -m 256M -nographic \
-bios "$IMAGES"/fw_jump.bin \ -bios "$IMAGES"/fw_jump.bin \
-kernel "$IMAGES"/Image \ -kernel "$IMAGES"/Image \
-initrd "$IMAGES"/rootfs.cpio \ -initrd "$IMAGES"/rootfs.cpio \
-dtb "$IMAGES"/wally-virt.dtb \ -dtb "$IMAGES"/wally-virt.dtb \
-cpu rva22s64,zicond=true,zfa=true,zfh=true,zcb=true,zbc=true,zkn=true,sstc=true,svadu=true,svnapot=true -cpu rva22s64,zicond=true,zfa=true,zfh=true,zcb=true,zbc=true,zkn=true,sstc=true,svadu=true,svnapot=true \
$GDB_FLAG