Fix many of the warnings that show up when compiling with GCC 15.2

1 files changed, 15 insertions, 25 deletions

diff --git a/arch/arm64/disassembler/pcode.c b/arch/arm64/disassembler/pcode.c
index 7993e312..46ffdcec 100644
--- a/arch/arm64/disassembler/pcode.c
+++ b/arch/arm64/disassembler/pcode.c
@@ -584,37 +584,29 @@ uint64_t Replicate(uint64_t val, uint8_t times, uint64_t width)
   https://github.com/Siguza/iometa/blob/master/src/a64.c */
 uint64_t AdvSIMDExpandImm(uint8_t op, uint8_t cmode, uint64_t imm8)
 {
-	uint64_t imm64;
 	switch ((cmode >> 1) & 0b111)
 	{
 	case 0b000:
-		imm64 = Replicate(imm8, 2, 32);
-		break;
+		return Replicate(imm8, 2, 32);
 	case 0b001:
-		imm64 = Replicate(imm8 << 8, 2, 32);
-		break;
+		return Replicate(imm8 << 8, 2, 32);
 	case 0b010:
-		imm64 = Replicate(imm8 << 16, 2, 32);
-		break;
+		return Replicate(imm8 << 16, 2, 32);
 	case 0b011:
-		imm64 = Replicate(imm8 << 24, 2, 32);
-		break;
+		return Replicate(imm8 << 24, 2, 32);
 	case 0b100:
-		imm64 = Replicate(imm8, 4, 16);
-		break;
+		return Replicate(imm8, 4, 16);
 	case 0b101:
-		imm64 = Replicate(imm8 << 8, 4, 16);
-		break;
+		return Replicate(imm8 << 8, 4, 16);
 	case 0b110:
-		imm64 = Replicate(imm8 << (8 << (cmode & 0b1)), 2, 32);
-		break;
+		return Replicate(imm8 << (8 << (cmode & 0b1)), 2, 32);
 	case 0b111:
 		switch (((cmode & 0b1) << 1) | op)
 		{
 		case 0b00:
-			imm64 = Replicate(imm8, 8, 8);
-			break;
+			return Replicate(imm8, 8, 8);
 		case 0b01:
+		{
 #if 0
 					imm8a = Replicate((imm8 >> 7) & 0b1, 8, 1);
 					imm8b = Replicate((imm8 >> 6) & 0b1, 8, 1);
@@ -626,26 +618,24 @@ uint64_t AdvSIMDExpandImm(uint8_t op, uint8_t cmode, uint64_t imm8)
 					imm8h = Replicate((imm8	 ) & 0b1, 8, 1);
 					imm64 = (imm8a << 0x38) | (imm8b << 0x30) | (imm8c << 0x28) | (imm8d << 0x20) | (imm8e << 0x18) | (imm8f << 0x10) | (imm8g << 0x08) | imm8h;
 #else
-			imm64 = imm8 | (imm8 << (0x08 - 1)) | (imm8 << (0x10 - 2)) | (imm8 << (0x18 - 3)) |
+			uint64_t imm64 = imm8 | (imm8 << (0x08 - 1)) | (imm8 << (0x10 - 2)) | (imm8 << (0x18 - 3)) |
 			        (imm8 << (0x20 - 4)) | (imm8 << (0x28 - 5)) | (imm8 << (0x30 - 6)) |
 			        (imm8 << (0x38 - 7));
 			imm64 &= 0x0101010101010101;
-			imm64 = Replicate(imm64, 8, 1);
+			return Replicate(imm64, 8, 1);
 #endif
-			break;
+		}
 		case 0b10:
-			imm64 = Replicate((((imm8 & 0xc0) ^ 0x80) << 24) |
+			return Replicate((((imm8 & 0xc0) ^ 0x80) << 24) |
 			                      (Replicate((imm8 >> 6) & 0b1, 5, 1) << 25) | ((imm8 & 0x3f) << 19),
 			    2, 32);
-			break;
 		case 0b11:
-			imm64 = (((imm8 & 0xc0) ^ 0x80) << 56) | (Replicate((imm8 >> 6) & 0b1, 8, 1) << 54) |
+			return (((imm8 & 0xc0) ^ 0x80) << 56) | (Replicate((imm8 >> 6) & 0b1, 8, 1) << 54) |
 			        ((imm8 & 0x3f) << 48);
-			break;
 		}
 		break;
 	}
-	return imm64;
+	return 0;
 }
 
 bool BTypeCompatible_BTI(uint8_t hintcode, uint8_t pstate_btype)