From 1a31b34a18d61dee55042f2ab23c8fa9203fe6ef Mon Sep 17 00:00:00 2001 From: Yao Qi Date: Fri, 9 Dec 2016 15:27:43 +0000 Subject: [PATCH] Create tdep->rl78_psw_type lazily I build GDB for all targets enabled. When I "set architecture rl78", GDB crashes, (gdb) set architecture rl78 Program received signal SIGSEGV, Segmentation fault. append_flags_type_flag (type=0x20cc0e0, bitpos=bitpos@entry=0, name=name@entry=0x11dba3f "CY") at ../../binutils-gdb/gdb/gdbtypes.c:4926 4926 name); (gdb) bt 10 #0 append_flags_type_flag (type=0x20cc0e0, bitpos=bitpos@entry=0, name=name@entry=0x11dba3f "CY") at ../../binutils-gdb/gdb/gdbtypes.c:4926 #1 0x00000000004aaca8 in rl78_gdbarch_init (info=..., arches=) at ../../binutils-gdb/gdb/rl78-tdep.c:1410 #2 0x00000000006b05a4 in gdbarch_find_by_info (info=...) at ../../binutils-gdb/gdb/gdbarch.c:5269 #3 0x000000000060eee4 in gdbarch_update_p (info=...) at ../../binutils-gdb/gdb/arch-utils.c:557 #4 0x000000000060f8a8 in set_architecture (ignore_args=, from_tty=1, c=) at ../../binutils-gdb/gdb/arch-utils.c:531 #5 0x0000000000593d0b in do_set_command (arg=, arg@entry=0x20be851 "rl78", from_tty=from_tty@entry=1, c=c@entry=0x20b1540) at ../../binutils-gdb/gdb/cli/cli-setshow.c:455 #6 0x00000000007665c3 in execute_command (p=, p@entry=0x20be840 "set architecture rl78", from_tty=1) at ../../binutils-gdb/gdb/top.c:666 #7 0x00000000006935f4 in command_handler (command=0x20be840 "set architecture rl78") at ../../binutils-gdb/gdb/event-top.c:577 #8 0x00000000006938d8 in command_line_handler (rl=) at ../../binutils-gdb/gdb/event-top.c:767 #9 0x0000000000692c2c in gdb_rl_callback_handler (rl=0x20be890 "") at ../../binutils-gdb/gdb/event-top.c:200 The cause is that we want to access some builtin types in gdbarch init, but it is not initialized yet. I fix it by creating the type when it is to be used. We've already done this in sparc, sparc64 and m68k. gdb: 2016-12-09 Yao Qi PR tdep/20953 * rl78-tdep.c (rl78_psw_type): New function. (rl78_register_type): Call rl78_psw_type. (rl78_gdbarch_init): Move code to rl78_psw_type. gdb/testsuite: 2016-12-09 Yao Qi * gdb.base/all-architectures.exp.in: Remove kfail for rl78. --- gdb/rl78-tdep.c | 36 +++++++++++++------ .../gdb.base/all-architectures.exp.in | 6 ---- 2 files changed, 25 insertions(+), 17 deletions(-) diff --git a/gdb/rl78-tdep.c b/gdb/rl78-tdep.c index 95a26a5124..0e88fbc037 100644 --- a/gdb/rl78-tdep.c +++ b/gdb/rl78-tdep.c @@ -261,6 +261,30 @@ struct rl78_prologue int reg_offset[RL78_NUM_TOTAL_REGS]; }; +/* Construct type for PSW register. */ + +static struct type * +rl78_psw_type (struct gdbarch *gdbarch) +{ + struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch); + + if (tdep->rl78_psw_type == NULL) + { + tdep->rl78_psw_type = arch_flags_type (gdbarch, + "builtin_type_rl78_psw", 1); + append_flags_type_flag (tdep->rl78_psw_type, 0, "CY"); + append_flags_type_flag (tdep->rl78_psw_type, 1, "ISP0"); + append_flags_type_flag (tdep->rl78_psw_type, 2, "ISP1"); + append_flags_type_flag (tdep->rl78_psw_type, 3, "RBS0"); + append_flags_type_flag (tdep->rl78_psw_type, 4, "AC"); + append_flags_type_flag (tdep->rl78_psw_type, 5, "RBS1"); + append_flags_type_flag (tdep->rl78_psw_type, 6, "Z"); + append_flags_type_flag (tdep->rl78_psw_type, 7, "IE"); + } + + return tdep->rl78_psw_type; +} + /* Implement the "register_type" gdbarch method. */ static struct type * @@ -273,7 +297,7 @@ rl78_register_type (struct gdbarch *gdbarch, int reg_nr) else if (reg_nr == RL78_RAW_PC_REGNUM) return tdep->rl78_uint32; else if (reg_nr == RL78_PSW_REGNUM) - return (tdep->rl78_psw_type); + return rl78_psw_type (gdbarch); else if (reg_nr <= RL78_MEM_REGNUM || (RL78_X_REGNUM <= reg_nr && reg_nr <= RL78_H_REGNUM) || (RL78_BANK0_R0_REGNUM <= reg_nr @@ -1406,16 +1430,6 @@ rl78_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) tdep->rl78_code_pointer = arch_pointer_type (gdbarch, 32, "rl78_code_addr_t", tdep->rl78_void); - tdep->rl78_psw_type = arch_flags_type (gdbarch, "builtin_type_rl78_psw", 1); - append_flags_type_flag (tdep->rl78_psw_type, 0, "CY"); - append_flags_type_flag (tdep->rl78_psw_type, 1, "ISP0"); - append_flags_type_flag (tdep->rl78_psw_type, 2, "ISP1"); - append_flags_type_flag (tdep->rl78_psw_type, 3, "RBS0"); - append_flags_type_flag (tdep->rl78_psw_type, 4, "AC"); - append_flags_type_flag (tdep->rl78_psw_type, 5, "RBS1"); - append_flags_type_flag (tdep->rl78_psw_type, 6, "Z"); - append_flags_type_flag (tdep->rl78_psw_type, 7, "IE"); - /* Registers. */ set_gdbarch_num_regs (gdbarch, RL78_NUM_REGS); set_gdbarch_num_pseudo_regs (gdbarch, RL78_NUM_PSEUDO_REGS); diff --git a/gdb/testsuite/gdb.base/all-architectures.exp.in b/gdb/testsuite/gdb.base/all-architectures.exp.in index 4a8099ca45..94bee2e0c8 100644 --- a/gdb/testsuite/gdb.base/all-architectures.exp.in +++ b/gdb/testsuite/gdb.base/all-architectures.exp.in @@ -209,12 +209,6 @@ with_test_prefix "tests" { continue } - if {$arch == "rl78"} { - if {$want_tests_messages} { - kfail "set architecture rl78" "gdb/20953" - } - continue - } if {$arch == "rx"} { if {$want_tests_messages} { kfail "set architecture rx" "gdb/20954" -- 2.34.1