Skip to content

Commit 04849c9

Browse files
philmdphilmd
committed
disas/nanomips: Fix invalid PRId64 format calling img_format()
Fix warnings such: disas/nanomips.c:3251:64: warning: format specifies type 'char *' but the argument has type 'int64' (aka 'long long') [-Wformat] return img_format("CACHE 0x%" PRIx64 ", %s(%s)", op_value, s_value, rs); ~~ ^~~~~~~ %lld To avoid crashes such (kernel from commit f375ad6): $ qemu-system-mipsel -cpu I7200 -d in_asm -kernel generic_nano32r6el_page4k ... ---------------- IN: __bzero 0x805c6084: 20c4 6950 ADDU r13, a0, a2 0x805c6088: 9089 ADDIU a0, 1 Process 70261 stopped * thread qemu#6, stop reason = EXC_BAD_ACCESS (code=1, address=0xfffffffffffffff0) frame #0: 0x00000001bfe38864 libsystem_platform.dylib`_platform_strlen + 4 libsystem_platform.dylib`: -> 0x1bfe38864 <+4>: ldr q0, [x1] 0x1bfe38868 <+8>: adr x3, #-0xc8 ; ___lldb_unnamed_symbol314 0x1bfe3886c <+12>: ldr q2, [x3], #0x10 0x1bfe38870 <+16>: and x2, x0, #0xf Target 0: (qemu-system-mipsel) stopped. (lldb) bt * thread qemu#6, stop reason = EXC_BAD_ACCESS (code=1, address=0xfffffffffffffff0) * frame #0: 0x00000001bfe38864 libsystem_platform.dylib`_platform_strlen + 4 frame #1: 0x00000001bfce76a0 libsystem_c.dylib`__vfprintf + 4544 frame #2: 0x00000001bfd158b4 libsystem_c.dylib`_vasprintf + 280 frame #3: 0x0000000101c22fb0 libglib-2.0.0.dylib`g_vasprintf + 28 frame qemu#4: 0x0000000101bfb7d8 libglib-2.0.0.dylib`g_strdup_vprintf + 32 frame qemu#5: 0x000000010000fb70 qemu-system-mipsel`img_format(format=<unavailable>) at nanomips.c:103:14 [opt] frame qemu#6: 0x0000000100018868 qemu-system-mipsel`SB_S9_(instruction=<unavailable>, info=<unavailable>) at nanomips.c:12616:12 [opt] frame qemu#7: 0x000000010000f90c qemu-system-mipsel`print_insn_nanomips at nanomips.c:589:28 [opt] Fixes: 4066c15 ("disas/nanomips: Remove IMMEDIATE functions") Reported-by: Stefan Weil <[email protected]> Reviewed-by: Stefan Weil <[email protected]> Signed-off-by: Philippe Mathieu-Daudé <[email protected]> Message-Id: <[email protected]>
1 parent 2a2105a commit 04849c9

File tree

1 file changed

+20
-15
lines changed

1 file changed

+20
-15
lines changed

‎disas/nanomips.c‎

Lines changed: 20 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3252,7 +3252,8 @@ static char *CACHE(uint64 instruction, Dis_info *info)
32523252

32533253
const char *rs = GPR(rs_value, info);
32543254

3255-
return img_format("CACHE 0x%" PRIx64 ", %s(%s)", op_value, s_value, rs);
3255+
return img_format("CACHE 0x%" PRIx64 ", %" PRId64 "(%s)",
3256+
op_value, s_value, rs);
32563257
}
32573258

32583259

@@ -3274,7 +3275,8 @@ static char *CACHEE(uint64 instruction, Dis_info *info)
32743275

32753276
const char *rs = GPR(rs_value, info);
32763277

3277-
return img_format("CACHEE 0x%" PRIx64 ", %s(%s)", op_value, s_value, rs);
3278+
return img_format("CACHEE 0x%" PRIx64 ", %" PRId64 "(%s)",
3279+
op_value, s_value, rs);
32783280
}
32793281

32803282

@@ -5173,7 +5175,7 @@ static char *DADDIU_48_(uint64 instruction, Dis_info *info)
51735175

51745176
const char *rt = GPR(rt_value, info);
51755177

5176-
return img_format("DADDIU %s, %s", rt, s_value);
5178+
return img_format("DADDIU %s, %" PRId64, rt, s_value);
51775179
}
51785180

51795181

@@ -11859,7 +11861,7 @@ static char *PREF_S9_(uint64 instruction, Dis_info *info)
1185911861

1186011862
const char *rs = GPR(rs_value, info);
1186111863

11862-
return img_format("PREF 0x%" PRIx64 ", %s(%s)",
11864+
return img_format("PREF 0x%" PRIx64 ", %" PRId64 "(%s)",
1186311865
hint_value, s_value, rs);
1186411866
}
1186511867

@@ -11905,7 +11907,8 @@ static char *PREFE(uint64 instruction, Dis_info *info)
1190511907

1190611908
const char *rs = GPR(rs_value, info);
1190711909

11908-
return img_format("PREFE 0x%" PRIx64 ", %s(%s)", hint_value, s_value, rs);
11910+
return img_format("PREFE 0x%" PRIx64 ", %" PRId64 "(%s)",
11911+
hint_value, s_value, rs);
1190911912
}
1191011913

1191111914

@@ -12079,7 +12082,7 @@ static char *REPL_PH(uint64 instruction, Dis_info *info)
1207912082

1208012083
const char *rt = GPR(rt_value, info);
1208112084

12082-
return img_format("REPL.PH %s, %s", rt, s_value);
12085+
return img_format("REPL.PH %s, %" PRId64, rt, s_value);
1208312086
}
1208412087

1208512088

@@ -12613,7 +12616,7 @@ static char *SB_S9_(uint64 instruction, Dis_info *info)
1261312616
const char *rt = GPR(rt_value, info);
1261412617
const char *rs = GPR(rs_value, info);
1261512618

12616-
return img_format("SB %s, %s(%s)", rt, s_value, rs);
12619+
return img_format("SB %s, %" PRId64 "(%s)", rt, s_value, rs);
1261712620
}
1261812621

1261912622

@@ -12659,7 +12662,7 @@ static char *SBE(uint64 instruction, Dis_info *info)
1265912662
const char *rt = GPR(rt_value, info);
1266012663
const char *rs = GPR(rs_value, info);
1266112664

12662-
return img_format("SBE %s, %s(%s)", rt, s_value, rs);
12665+
return img_format("SBE %s, %" PRId64 "(%s)", rt, s_value, rs);
1266312666
}
1266412667

1266512668

@@ -12706,7 +12709,7 @@ static char *SC(uint64 instruction, Dis_info *info)
1270612709
const char *rt = GPR(rt_value, info);
1270712710
const char *rs = GPR(rs_value, info);
1270812711

12709-
return img_format("SC %s, %s(%s)", rt, s_value, rs);
12712+
return img_format("SC %s, %" PRId64 "(%s)", rt, s_value, rs);
1271012713
}
1271112714

1271212715

@@ -12729,7 +12732,7 @@ static char *SCD(uint64 instruction, Dis_info *info)
1272912732
const char *rt = GPR(rt_value, info);
1273012733
const char *rs = GPR(rs_value, info);
1273112734

12732-
return img_format("SCD %s, %s(%s)", rt, s_value, rs);
12735+
return img_format("SCD %s, %" PRId64 "(%s)", rt, s_value, rs);
1273312736
}
1273412737

1273512738

@@ -12776,7 +12779,7 @@ static char *SCE(uint64 instruction, Dis_info *info)
1277612779
const char *rt = GPR(rt_value, info);
1277712780
const char *rs = GPR(rs_value, info);
1277812781

12779-
return img_format("SCE %s, %s(%s)", rt, s_value, rs);
12782+
return img_format("SCE %s, %" PRId64 "(%s)", rt, s_value, rs);
1278012783
}
1278112784

1278212785

@@ -12868,7 +12871,7 @@ static char *SD_S9_(uint64 instruction, Dis_info *info)
1286812871
const char *rt = GPR(rt_value, info);
1286912872
const char *rs = GPR(rs_value, info);
1287012873

12871-
return img_format("SD %s, %s(%s)", rt, s_value, rs);
12874+
return img_format("SD %s, %" PRId64 "(%s)", rt, s_value, rs);
1287212875
}
1287312876

1287412877

@@ -12973,7 +12976,7 @@ static char *SDC1_S9_(uint64 instruction, Dis_info *info)
1297312976
const char *ft = FPR(ft_value, info);
1297412977
const char *rs = GPR(rs_value, info);
1297512978

12976-
return img_format("SDC1 %s, %s(%s)", ft, s_value, rs);
12979+
return img_format("SDC1 %s, %" PRId64 "(%s)", ft, s_value, rs);
1297712980
}
1297812981

1297912982

@@ -13066,7 +13069,8 @@ static char *SDC2(uint64 instruction, Dis_info *info)
1306613069

1306713070
const char *rs = GPR(rs_value, info);
1306813071

13069-
return img_format("SDC2 CP%" PRIu64 ", %s(%s)", cs_value, s_value, rs);
13072+
return img_format("SDC2 CP%" PRIu64 ", %" PRId64 "(%s)",
13073+
cs_value, s_value, rs);
1307013074
}
1307113075

1307213076

@@ -13091,7 +13095,8 @@ static char *SDM(uint64 instruction, Dis_info *info)
1309113095
const char *rs = GPR(rs_value, info);
1309213096
uint64 count3 = encode_count3_from_count(count3_value);
1309313097

13094-
return img_format("SDM %s, %s(%s), 0x%" PRIx64, rt, s_value, rs, count3);
13098+
return img_format("SDM %s, %" PRId64 "(%s), 0x%" PRIx64,
13099+
rt, s_value, rs, count3);
1309513100
}
1309613101

1309713102

0 commit comments

Comments
 (0)