From f8b786e2eddbbad9e9aa724038feb1ffcf7b2bd9 Mon Sep 17 00:00:00 2001 From: Youling Tang Date: Tue, 10 May 2022 22:07:04 +0100 Subject: [PATCH] gdb: mips: Fix large-frame.exp test case failure $ objdump -d outputs/gdb.base/large-frame/large-frame-O2 0000000120000b20 : 120000b20: 67bdbff0 daddiu sp,sp,-16400 120000b24: ffbc4000 sd gp,16384(sp) 120000b28: 3c1c0002 lui gp,0x2 120000b2c: 679c8210 daddiu gp,gp,-32240 120000b30: 0399e02d daddu gp,gp,t9 120000b34: df998058 ld t9,-32680(gp) 120000b38: ffbf4008 sd ra,16392(sp) 120000b3c: 0411ffd8 bal 120000aa0 ... The disassembly of the above func function shows that we may use instructions such as daddiu/daddu, so add "daddiu $gp,$gp,n", "daddu $gp,$gp,$t9" and "daddu $gp,$t9,$gp" to the mips32_scan_prologue function to fix the large-frame.exp test case. Before applying the patch: backtrace #0 blah (a=0xfffffee220) at .../gdb/testsuite/gdb.base/large-frame-1.c:24 #1 0x0000000120000b44 in func () Backtrace stopped: frame did not save the PC (gdb) FAIL: gdb.base/large-frame.exp: optimize=-O2: backtrace # of expected passes 5 # of unexpected failures 1 After applying the patch: # of expected passes 6 Signed-off-by: Youling Tang --- gdb/mips-tdep.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gdb/mips-tdep.c b/gdb/mips-tdep.c index ffed8723dce..805c5beba59 100644 --- a/gdb/mips-tdep.c +++ b/gdb/mips-tdep.c @@ -3588,8 +3588,11 @@ restart: || (inst & 0xFF9F07FF) == 0x00800021 /* move reg,$a0-$a3 */ || high_word == 0x3c1c /* lui $gp,n */ || high_word == 0x279c /* addiu $gp,$gp,n */ + || high_word == 0x679c /* daddiu $gp,$gp,n */ || inst == 0x0399e021 /* addu $gp,$gp,$t9 */ || inst == 0x033ce021 /* addu $gp,$t9,$gp */ + || inst == 0x0399e02d /* daddu $gp,$gp,$t9 */ + || inst == 0x033ce02d /* daddu $gp,$t9,$gp */ ) { /* These instructions are part of the prologue, but we don't -- 2.30.2