arch, base, dev, sim: Remove now unnecessary casts from PortProxy methods.

Change-Id: Ia73b2d86a10d02fa09c924a4571477bb5f200eb7
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/18572
Tested-by: kokoro <noreply+kokoro@google.com>
Reviewed-by: Andreas Sandberg <andreas.sandberg@arm.com>
Reviewed-by: Jason Lowe-Power <jason@lowepower.com>
Maintainer: Jason Lowe-Power <jason@lowepower.com>

3 files changed, 40 insertions, 47 deletions

diff --git a/src/arch/x86/bios/e820.cc b/src/arch/x86/bios/e820.cc
index a1daf0a04..6cb16c995 100644
--- a/src/arch/x86/bios/e820.cc
+++ b/src/arch/x86/bios/e820.cc
@@ -50,7 +50,7 @@ template<class T>
 void writeVal(T val, PortProxy& proxy, Addr &addr)
 {
     T guestVal = htog(val);
-    proxy.writeBlob(addr, (uint8_t *)&guestVal, sizeof(T));
+    proxy.writeBlob(addr, &guestVal, sizeof(T));
     addr += sizeof(T);
 }
 
@@ -64,7 +64,7 @@ void X86ISA::E820Table::writeTo(PortProxy& proxy, Addr countAddr, Addr addr)
 
     uint8_t guestE820Nr = htog(e820Nr);
 
-    proxy.writeBlob(countAddr, (uint8_t *)&guestE820Nr, sizeof(guestE820Nr));
+    proxy.writeBlob(countAddr, &guestE820Nr, sizeof(guestE820Nr));
 
     for (int i = 0; i < e820Nr; i++) {
         writeVal(entries[i]->addr, proxy, addr);
diff --git a/src/arch/x86/bios/intelmp.cc b/src/arch/x86/bios/intelmp.cc
index 07d2f1333..a9da25a8a 100644
--- a/src/arch/x86/bios/intelmp.cc
+++ b/src/arch/x86/bios/intelmp.cc
@@ -74,7 +74,7 @@ uint8_t
 writeOutField(PortProxy& proxy, Addr addr, T val)
 {
     uint64_t guestVal = X86ISA::htog(val);
-    proxy.writeBlob(addr, (uint8_t *)(&guestVal), sizeof(T));
+    proxy.writeBlob(addr, &guestVal, sizeof(T));
 
     uint8_t checkSum = 0;
     while (guestVal) {
@@ -98,7 +98,7 @@ writeOutString(PortProxy& proxy, Addr addr, string str, int length)
         memcpy(cleanedString, str.c_str(), str.length());
         memset(cleanedString + str.length(), 0, length - str.length());
     }
-    proxy.writeBlob(addr, (uint8_t *)(&cleanedString), length);
+    proxy.writeBlob(addr, &cleanedString, length);
 
     uint8_t checkSum = 0;
     for (int i = 0; i < length; i++)
@@ -121,7 +121,7 @@ X86ISA::IntelMP::FloatingPointer::writeOut(PortProxy& proxy, Addr addr)
 
     uint8_t checkSum = 0;
 
-    proxy.writeBlob(addr, (uint8_t *)signature, 4);
+    proxy.writeBlob(addr, signature, 4);
     for (int i = 0; i < 4; i++)
         checkSum += signature[i];
 
@@ -194,13 +194,13 @@ X86ISA::IntelMP::ConfigTable::writeOut(PortProxy& proxy, Addr addr)
 {
     uint8_t checkSum = 0;
 
-    proxy.writeBlob(addr, (uint8_t *)signature, 4);
+    proxy.writeBlob(addr, signature, 4);
     for (int i = 0; i < 4; i++)
         checkSum += signature[i];
 
     // Base table length goes here but will be calculated later.
 
-    proxy.writeBlob(addr + 6, (uint8_t *)(&specRev), 1);
+    proxy.writeBlob(addr + 6, &specRev, 1);
     checkSum += specRev;
 
     // The checksum goes here but is still being calculated.
@@ -272,8 +272,8 @@ X86ISA::IntelMP::Processor::writeOut(
     checkSum += writeOutField(proxy, addr + 8, featureFlags);
 
     uint32_t reserved = 0;
-    proxy.writeBlob(addr + 12, (uint8_t *)(&reserved), 4);
-    proxy.writeBlob(addr + 16, (uint8_t *)(&reserved), 4);
+    proxy.writeBlob(addr + 12, &reserved, 4);
+    proxy.writeBlob(addr + 16, &reserved, 4);
     return 20;
 }
 
@@ -414,7 +414,7 @@ X86ISA::IntelMP::BusHierarchy::writeOut(
     checkSum += writeOutField(proxy, addr + 4, parentBus);
 
     uint32_t reserved = 0;
-    proxy.writeBlob(addr + 5, (uint8_t *)(&reserved), 3);
+    proxy.writeBlob(addr + 5, &reserved, 3);
 
     return length;
 }
diff --git a/src/arch/x86/bios/smbios.cc b/src/arch/x86/bios/smbios.cc
index 26785f5a8..cd91d2d02 100644
--- a/src/arch/x86/bios/smbios.cc
+++ b/src/arch/x86/bios/smbios.cc
@@ -77,13 +77,13 @@ composeBitVector(T vec)
 uint16_t
 X86ISA::SMBios::SMBiosStructure::writeOut(PortProxy& proxy, Addr addr)
 {
-    proxy.writeBlob(addr, (uint8_t *)(&type), 1);
+    proxy.writeBlob(addr, &type, 1);
 
     uint8_t length = getLength();
-    proxy.writeBlob(addr + 1, (uint8_t *)(&length), 1);
+    proxy.writeBlob(addr + 1, &length, 1);
 
     uint16_t handleGuest = X86ISA::htog(handle);
-    proxy.writeBlob(addr + 2, (uint8_t *)(&handleGuest), 2);
+    proxy.writeBlob(addr + 2, &handleGuest, 2);
 
     return length + getStringLength();
 }
@@ -104,16 +104,15 @@ X86ISA::SMBios::SMBiosStructure::writeOutStrings(
     // If there are string fields but none of them are used, that's a
     // special case which is handled by this if.
     if (strings.size() == 0 && stringFields) {
-        proxy.writeBlob(addr + offset, (uint8_t *)(&nullTerminator), 1);
+        proxy.writeBlob(addr + offset, &nullTerminator, 1);
         offset++;
     } else {
         for (it = strings.begin(); it != strings.end(); it++) {
-            proxy.writeBlob(addr + offset,
-                    (uint8_t *)it->c_str(), it->length() + 1);
+            proxy.writeBlob(addr + offset, it->c_str(), it->length() + 1);
             offset += it->length() + 1;
         }
     }
-    proxy.writeBlob(addr + offset, (uint8_t *)(&nullTerminator), 1);
+    proxy.writeBlob(addr + offset, &nullTerminator, 1);
 }
 
 int
@@ -177,26 +176,26 @@ X86ISA::SMBios::BiosInformation::writeOut(PortProxy& proxy, Addr addr)
 {
     uint8_t size = SMBiosStructure::writeOut(proxy, addr);
 
-    proxy.writeBlob(addr + 0x4, (uint8_t *)(&vendor), 1);
-    proxy.writeBlob(addr + 0x5, (uint8_t *)(&version), 1);
+    proxy.writeBlob(addr + 0x4, &vendor, 1);
+    proxy.writeBlob(addr + 0x5, &version, 1);
 
     uint16_t startingAddrSegmentGuest = X86ISA::htog(startingAddrSegment);
-    proxy.writeBlob(addr + 0x6, (uint8_t *)(&startingAddrSegmentGuest), 2);
+    proxy.writeBlob(addr + 0x6, &startingAddrSegmentGuest, 2);
 
-    proxy.writeBlob(addr + 0x8, (uint8_t *)(&releaseDate), 1);
-    proxy.writeBlob(addr + 0x9, (uint8_t *)(&romSize), 1);
+    proxy.writeBlob(addr + 0x8, &releaseDate, 1);
+    proxy.writeBlob(addr + 0x9, &romSize, 1);
 
     uint64_t characteristicsGuest = X86ISA::htog(characteristics);
-    proxy.writeBlob(addr + 0xA, (uint8_t *)(&characteristicsGuest), 8);
+    proxy.writeBlob(addr + 0xA, &characteristicsGuest, 8);
 
     uint16_t characteristicExtBytesGuest =
         X86ISA::htog(characteristicExtBytes);
-    proxy.writeBlob(addr + 0x12, (uint8_t *)(&characteristicExtBytesGuest), 2);
+    proxy.writeBlob(addr + 0x12, &characteristicExtBytesGuest, 2);
 
-    proxy.writeBlob(addr + 0x14, (uint8_t *)(&majorVer), 1);
-    proxy.writeBlob(addr + 0x15, (uint8_t *)(&minorVer), 1);
-    proxy.writeBlob(addr + 0x16, (uint8_t *)(&embContFirmwareMajor), 1);
-    proxy.writeBlob(addr + 0x17, (uint8_t *)(&embContFirmwareMinor), 1);
+    proxy.writeBlob(addr + 0x14, &majorVer, 1);
+    proxy.writeBlob(addr + 0x15, &minorVer, 1);
+    proxy.writeBlob(addr + 0x16, &embContFirmwareMajor, 1);
+    proxy.writeBlob(addr + 0x17, &embContFirmwareMinor, 1);
 
     writeOutStrings(proxy, addr + getLength());
 
@@ -231,21 +230,16 @@ X86ISA::SMBios::SMBiosTable::writeOut(PortProxy& proxy, Addr addr,
 
     // The checksum goes here, but we're figuring it out as we go.
 
-    proxy.writeBlob(addr + 0x5,
-            (uint8_t *)(&smbiosHeader.entryPointLength), 1);
+    proxy.writeBlob(addr + 0x5, &smbiosHeader.entryPointLength, 1);
     mainChecksum += smbiosHeader.entryPointLength;
-    proxy.writeBlob(addr + 0x6,
-            (uint8_t *)(&smbiosHeader.majorVersion), 1);
+    proxy.writeBlob(addr + 0x6, &smbiosHeader.majorVersion, 1);
     mainChecksum += smbiosHeader.majorVersion;
-    proxy.writeBlob(addr + 0x7,
-            (uint8_t *)(&smbiosHeader.minorVersion), 1);
+    proxy.writeBlob(addr + 0x7, &smbiosHeader.minorVersion, 1);
     mainChecksum += smbiosHeader.minorVersion;
     // Maximum structure size goes here, but we'll figure it out later.
-    proxy.writeBlob(addr + 0xA,
-            (uint8_t *)(&smbiosHeader.entryPointRevision), 1);
+    proxy.writeBlob(addr + 0xA, &smbiosHeader.entryPointRevision, 1);
     mainChecksum += smbiosHeader.entryPointRevision;
-    proxy.writeBlob(addr + 0xB,
-            (uint8_t *)(&smbiosHeader.formattedArea), 5);
+    proxy.writeBlob(addr + 0xB, &smbiosHeader.formattedArea, 5);
     for (int i = 0; i < 5; i++)
         mainChecksum += smbiosHeader.formattedArea[i];
 
@@ -255,7 +249,7 @@ X86ISA::SMBios::SMBiosTable::writeOut(PortProxy& proxy, Addr addr,
     uint8_t intChecksum = 0;
 
     proxy.writeBlob(addr + 0x10,
-            (uint8_t *)smbiosHeader.intermediateHeader.anchorString, 5);
+            smbiosHeader.intermediateHeader.anchorString, 5);
     for (int i = 0; i < 5; i++)
         intChecksum += smbiosHeader.intermediateHeader.anchorString[i];
 
@@ -264,22 +258,21 @@ X86ISA::SMBios::SMBiosTable::writeOut(PortProxy& proxy, Addr addr,
 
     uint32_t tableAddrGuest =
         X86ISA::htog(smbiosHeader.intermediateHeader.tableAddr);
-    proxy.writeBlob(addr + 0x18, (uint8_t *)(&tableAddrGuest), 4);
+    proxy.writeBlob(addr + 0x18, &tableAddrGuest, 4);
     for (int i = 0; i < 4; i++) {
         intChecksum += tableAddrGuest;
         tableAddrGuest >>= 8;
     }
 
     uint16_t numStructs = X86ISA::gtoh(structures.size());
-    proxy.writeBlob(addr + 0x1C, (uint8_t *)(&numStructs), 2);
+    proxy.writeBlob(addr + 0x1C, &numStructs, 2);
     for (int i = 0; i < 2; i++) {
         intChecksum += numStructs;
         numStructs >>= 8;
     }
 
     proxy.writeBlob(addr + 0x1E,
-            (uint8_t *)(&smbiosHeader.intermediateHeader.smbiosBCDRevision),
-            1);
+            &smbiosHeader.intermediateHeader.smbiosBCDRevision, 1);
     intChecksum += smbiosHeader.intermediateHeader.smbiosBCDRevision;
 
     /*
@@ -304,7 +297,7 @@ X86ISA::SMBios::SMBiosTable::writeOut(PortProxy& proxy, Addr addr,
      */
 
     maxSize = X86ISA::htog(maxSize);
-    proxy.writeBlob(addr + 0x8, (uint8_t *)(&maxSize), 2);
+    proxy.writeBlob(addr + 0x8, &maxSize, 2);
     for (int i = 0; i < 2; i++) {
         mainChecksum += maxSize;
         maxSize >>= 8;
@@ -312,7 +305,7 @@ X86ISA::SMBios::SMBiosTable::writeOut(PortProxy& proxy, Addr addr,
 
     // Set the checksum
     mainChecksum = -mainChecksum;
-    proxy.writeBlob(addr + 0x4, (uint8_t *)(&mainChecksum), 1);
+    proxy.writeBlob(addr + 0x4, &mainChecksum, 1);
 
     /*
      * Intermediate header
@@ -320,14 +313,14 @@ X86ISA::SMBios::SMBiosTable::writeOut(PortProxy& proxy, Addr addr,
 
     uint16_t tableSize = offset;
     tableSize = X86ISA::htog(tableSize);
-    proxy.writeBlob(addr + 0x16, (uint8_t *)(&tableSize), 2);
+    proxy.writeBlob(addr + 0x16, &tableSize, 2);
     for (int i = 0; i < 2; i++) {
         intChecksum += tableSize;
         tableSize >>= 8;
     }
 
     intChecksum = -intChecksum;
-    proxy.writeBlob(addr + 0x15, (uint8_t *)(&intChecksum), 1);
+    proxy.writeBlob(addr + 0x15, &intChecksum, 1);
 }
 
 X86ISA::SMBios::BiosInformation *