dvp: Mark VU sections as qwords so they show up more compact

Author: VelocityRa

src/main/java/ghidra/emotionengine/dvp/DvpOverlayTable.java

@@ -42,27 +42,28 @@ private Structure getDvpExtOverlay() {
 	}
 
 	/**
-	 * Apply QWord data type to the memory block for compact display.
+	 * Apply QWord data type to a specific address range for compact display.
 	 * VU instructions are 16 bytes (2 qwords), so marking as qwords provides better visualization.
 	 */
-	private void applyQWordDataType(Program program, MemoryBlock block, TaskMonitor monitor) {
-		int txId = program.startTransaction("Apply QWord data type to " + block.getName());
+	private void applyQWordDataType(Program program, Address startAddr, long size, TaskMonitor monitor) {
+		int txId = program.startTransaction("Apply QWord data type");
 		try {
 			Listing listing = program.getListing();
-			Address addr = block.getStart();
-			Address end = block.getEnd();
+			Address addr = startAddr;
+			Address end = startAddr.add(size - 1);
 			DataType qword = QWordDataType.dataType;
 
+			// First, clear all existing code units (undefined data) in the range
+			listing.clearCodeUnits(addr, end, false);
+			
+			// Now apply qword data type across the range
 			while (addr.compareTo(end) <= 0) {
 				monitor.checkCancelled();
 				try {
-					// Only create data if there isn't already data at this location
-					if (listing.getDataAt(addr) == null) {
-						listing.createData(addr, qword);
-					}
+					listing.createData(addr, qword);
 					addr = addr.add(8); // QWord is 8 bytes
 				} catch (Exception e) {
-					// If we can't create data here (e.g., not enough bytes), skip
+					// If we can't create data here (e.g., not enough bytes remaining), stop
 					break;
 				}
 			}
@@ -151,8 +152,12 @@ public void parse(TaskMonitor monitor) throws Exception {
 
 				scalar = (Scalar) comp.getComponent(1).getValue();
 				Address mappedAddress = elf.getDefaultAddress(scalar.getValue());
+				long sectionSize = section.getLogicalSize();
+				
+				applyQWordDataType(elf.getProgram(), mappedAddress, sectionSize, monitor);
+				
 				block = mem.createByteMappedBlock(
-					blockName, addr, mappedAddress, (int) section.getLogicalSize(), true);
+					blockName, addr, mappedAddress, (int) sectionSize, true);
 				// TODO: Restore VU instructions in Sleigh files so we can enable this
 				// if (section.isExecutable()) {
 				// 	EmotionEngineLoader.setMicroMode(elf.getProgram(), block);
@@ -161,9 +166,6 @@ public void parse(TaskMonitor monitor) throws Exception {
 				// }
 				block.setRead(true);
 				block.setWrite(section.isWritable());
-				
-				// Apply QWord data type for compact display
-				applyQWordDataType(elf.getProgram(), block, monitor);
 			}
 			catch (Exception e) {
 				elf.getLog().appendException(e);
@@ -180,8 +182,13 @@ private void parseVuSection(ElfLoadHelper elfLoadHelper, ElfSectionHeader sectio
 		String sectionName = section.getNameAsString();
 		MemoryBlock origBlock = mem.getBlock(sectionAddress);
 		try {
+			long blockSize = origBlock.getSize();
+			
+			// Apply QWord data type to source address BEFORE creating byte-mapped block
+			applyQWordDataType(program, sectionAddress, blockSize, monitor);
+			
 			MemoryBlock block = mem.createByteMappedBlock(
-				sectionName + "_overlay", addr, sectionAddress, (int) origBlock.getSize(), true);
+				sectionName + "_overlay", addr, sectionAddress, (int) blockSize, true);
 			byte[] bytes = new byte[(int) section.getLogicalSize()];
 			MemoryBufferImpl buf = new MemoryBufferImpl(mem, sectionAddress);
 			buf.getBytes(bytes, 0);
@@ -197,9 +204,6 @@ private void parseVuSection(ElfLoadHelper elfLoadHelper, ElfSectionHeader sectio
 			// 	EmotionEngineLoader.setMicroMode(program, block);
 			// 	elfLoadHelper.createOneByteFunction(null, block.getStart(), true);
 			// }
-			
-			// Apply QWord data type for compact display
-			applyQWordDataType(program, block, monitor);
 		} catch (Exception e) {
 			elfLoadHelper.getLog().appendException(e);
 		}