Merge pull request #500 from ross144/main

Fixed linux makefile to build label and addr files from object dumps.

linux/Makefile

@@ -39,7 +39,7 @@ Image:
 	# source ../setup.sh; $(MAKE) disassemble
 
 install:
-	sudo mv -r $(BUILDROOT) $(RISCV)/$(BUILDROOT)
+	sudo mv $(BUILDROOT) $(RISCV)/$(BUILDROOT)
 
 # Temp rule for debugging
 test:
@@ -65,12 +65,15 @@ disassemble:
 	find  $(BUILDROOT)/output/build/linux-* -maxdepth 1 -name "vmlinux" | xargs  cp -t $(BUILDROOT)/output/images/
 	mkdir -p $(DIS)
 	make -j $(OBJDUMPS)
+	make -j $(OBJDUMPS).addr
 
 $(DIS)/%.objdump: $(IMAGES)/%.elf
 	riscv64-unknown-elf-objdump -DS $< >> $@
+	extractFunctionRadix.sh $@
 
 $(DIS)/%.objdump: $(IMAGES)/%
 	riscv64-unknown-elf-objdump -S $< >> $@
+	extractFunctionRadix.sh $@
 
 $(IMAGES)/vmlinux:
 	linuxDir=$$(find $(BUILDROOT)/output/build -maxdepth 2 -type d -regex ".*/linux-[0-9]+\.[0-9]+\.[0-9]+$$") ;\

linux/testvector-generation/EmulateLinux.sh

@@ -11,7 +11,7 @@ help() {
 
 # defaults
 imageDir=$RISCV/buildroot/output/images
-DEVICE_TREE=../devicetree/wally-virt.dtb
+DEVICE_TREE=${imageDir}/wally-virt.dtb
 
 # Process options and arguments. The following code grabs the single
 # sdcard device argument no matter where it is in the positional
@@ -36,8 +36,6 @@ done
 # File location variables
 imageDir=$BUILDROOT/output/images
 
-#imageDir=$RISCV/buildroot/output/images
-imageDir=~/repos/buildroot-sept2023/output/images
 tvDir=$RISCV/linux-testvectors
 tcpPort=1239
 

linux/testvector-generation/genInitMem.sh

@@ -8,7 +8,7 @@ rawBootmemFile="$tvDir/bootmemGDB.bin"
 bootmemFile="$tvDir/bootmem.bin"
 rawUntrimmedBootmemFile="$tvDir/untrimmedBootmemFileGDB.bin"
 untrimmedBootmemFile="$tvDir/untrimmedBootmemFile.bin"
-DEVICE_TREE=../devicetree/wally-virt.dtb
+DEVICE_TREE=${imageDir}/wally-virt.dtb
 
 read -p "Warning: running this script will overwrite the contents of:
   * $rawRamFile

linux/testvector-generation/genRecording.sh

@@ -2,7 +2,7 @@
 imageDir=$RISCV/buildroot/output/images
 tvDir=$RISCV/linux-testvectors
 recordFile="$tvDir/all.qemu"
-DEVICE_TREE=../devicetree/wally-virt.dtb
+DEVICE_TREE=${imageDir}/wally-virt.dtb
 
 read -p "Warning: running this script will overwrite $recordFile
 Would you like to proceed? (y/n) " -n 1 -r

linux/testvector-generation/genTrace.sh

@@ -6,7 +6,7 @@ recordFile="$tvDir/all.qemu"
 traceFile="$tvDir/all.txt"
 trapsFile="$tvDir/traps.txt"
 interruptsFile="$tvDir/interrupts.txt"
-DEVICE_TREE=../devicetree/wally-virt.dtb
+DEVICE_TREE=${imageDir}/wally-virt.dtb
 
 read -p "Warning: running this script will overwrite the contents of:
   * $traceFile