Change jump tables to use switch instead of array #80
Conversation
| uint32_t jtbl_addr; | ||
| uint32_t num_cases; | ||
| rabbitizer::Registers::Cpu::GprO32 index_reg; | ||
| bool jtbl_is_pic; |
There was a problem hiding this comment.
Is there any non-pic jumptable anywhere in IDO?
There was a problem hiding this comment.
not currently, but there are in ld and strip as you know. I don't think it's N32-specific though, and technically the current logic can detect IDO non-PIC jumptables anyway but it wasn't wired up
There was a problem hiding this comment.
Ah yeah, I was thinking on the n32 programs
| } else if (srdata_vaddr <= case_addr && case_addr < srdata_vaddr + srdata_section_len) { | ||
| target_addr = read_u32_be(srdata_section + (case_addr - srdata_vaddr)); |
There was a problem hiding this comment.
Oh, are there actually any jumptables in srdata? Are those non-pic?
There was a problem hiding this comment.
Yeah there's one in strip:
/* 016C4C 10016C4C 8F868024 */ lw $a2, %got(jtbl_1002F8B8)($gp)
/* 016C50 10016C50 DCA50050 */ ld $a1, 0x50($a1)
/* 016C54 10016C54 24C6F8B8 */ addiu $a2, $a2, %lo(jtbl_1002F8B8)
/* 016C58 10016C58 30A50007 */ andi $a1, $a1, 0x7
/* 016C5C 10016C5C 00052800 */ sll $a1, $a1, 0
/* 016C60 10016C60 2CA10008 */ sltiu $at, $a1, 0x8
/* 016C64 10016C64 00052880 */ sll $a1, $a1, 2
/* 016C68 10016C68 10200026 */ beqz $at, .L10016D04
/* 016C6C 10016C6C 00A62821 */ addu $a1, $a1, $a2
/* 016C70 10016C70 8CA60000 */ lw $a2, 0x0($a1)
/* 016C74 10016C74 00C00008 */ jr $a2
/* 016C78 10016C78 00000000 */ nop
It's not PIC, the jump table targets are absolute addresses (even though the jump table itself loaded via the GOT)
There was a problem hiding this comment.
Huh, it is pretty weird given the generated code should be position independent...
2 participants
I un-"bugged" this, the previous version didn't handle the delay slot (or rather, asserted the delay slot was a
nop). I also did some light refactoring to help with N32. Tested on OoT