History

modpost: change return type of addend_*_rel()

Now that none of addend_*_rel() returns a meaningful value (the return value is always 0), change all of them to return the value of r_addend.

Masahiro Yamada committed 3 years ago

Commit a68914a1 parent 783c55a1 file · +24 −39Browse files

Showing the changes to scripts (1 of 1 file). Show all

Unified · Split

scripts/mod/modpost.c+24−39
@@ -1257,21 +1257,18 @@ static void check_section_mismatch(struct module *mod, struct elf_info *elf, · 1256 unmodified lines
12571257 tosec, taddr);
12581258 }
12591259
1260−static int addend_386_rel(uint32_t *location, Elf_Rela *r)
1260+static Elf_Addr addend_386_rel(uint32_t *location, Elf_Rela *r)
12611261 {
12621262 unsigned int r_typ = ELF_R_TYPE(r->r_info);
12631263
12641264 switch (r_typ) {
12651265 case R_386_32:
1266− r->r_addend = TO_NATIVE(*location);
1267− break;
1266+ return TO_NATIVE(*location);
12681267 case R_386_PC32:
1269− r->r_addend = TO_NATIVE(*location) + 4;
1270− break;
1271− default:
1272− r->r_addend = (Elf_Addr)(-1);
1268+ return TO_NATIVE(*location) + 4;
12731269 }
1274− return 0;
1270+
1271+ return (Elf_Addr)(-1);
12751272 }
12761273
12771274 #ifndef R_ARM_CALL
@@ -1315,7 +1312,7 @@ static int32_t sign_extend32(int32_t value, int index) · 37 unmodified lines
13151312 return (int32_t)(value << shift) >> shift;
13161313 }
13171314
1318−static int addend_arm_rel(void *loc, Elf_Sym *sym, Elf_Rela *r)
1315+static Elf_Addr addend_arm_rel(void *loc, Elf_Sym *sym, Elf_Rela *r)
13191316 {
13201317 unsigned int r_typ = ELF_R_TYPE(r->r_info);
13211318 uint32_t inst, upper, lower, sign, j1, j2;
@@ -1325,22 +1322,19 @@ static int addend_arm_rel(void *loc, Elf_Sym *sym, Elf_Rela *r) · 3 unmodified lines
13251322 case R_ARM_ABS32:
13261323 case R_ARM_REL32:
13271324 inst = TO_NATIVE(*(uint32_t *)loc);
1328− r->r_addend = inst + sym->st_value;
1329− break;
1325+ return inst + sym->st_value;
13301326 case R_ARM_MOVW_ABS_NC:
13311327 case R_ARM_MOVT_ABS:
13321328 inst = TO_NATIVE(*(uint32_t *)loc);
13331329 offset = sign_extend32(((inst & 0xf0000) >> 4) | (inst & 0xfff),
13341330 15);
1335− r->r_addend = offset + sym->st_value;
1336− break;
1331+ return offset + sym->st_value;
13371332 case R_ARM_PC24:
13381333 case R_ARM_CALL:
13391334 case R_ARM_JUMP24:
13401335 inst = TO_NATIVE(*(uint32_t *)loc);
13411336 offset = sign_extend32((inst & 0x00ffffff) << 2, 25);
1342− r->r_addend = offset + sym->st_value + 8;
1343− break;
1337+ return offset + sym->st_value + 8;
13441338 case R_ARM_THM_MOVW_ABS_NC:
13451339 case R_ARM_THM_MOVT_ABS:
13461340 upper = TO_NATIVE(*(uint16_t *)loc);
@@ -1350,8 +1344,7 @@ static int addend_arm_rel(void *loc, Elf_Sym *sym, Elf_Rela *r) · 3 unmodified lines
13501344 ((lower & 0x7000) >> 4) |
13511345 (lower & 0x00ff),
13521346 15);
1353− r->r_addend = offset + sym->st_value;
1354− break;
1347+ return offset + sym->st_value;
13551348 case R_ARM_THM_JUMP19:
13561349 /*
13571350 * Encoding T3:
@@ -1372,8 +1365,7 @@ static int addend_arm_rel(void *loc, Elf_Sym *sym, Elf_Rela *r) · 14 unmodified lines
13721365 ((upper & 0x03f) << 12) |
13731366 ((lower & 0x07ff) << 1),
13741367 20);
1375− r->r_addend = offset + sym->st_value + 4;
1376− break;
1368+ return offset + sym->st_value + 4;
13771369 case R_ARM_THM_CALL:
13781370 case R_ARM_THM_JUMP24:
13791371 /*
@@ -1399,15 +1391,13 @@ static int addend_arm_rel(void *loc, Elf_Sym *sym, Elf_Rela *r) · 19 unmodified lines
13991391 ((upper & 0x03ff) << 12) |
14001392 ((lower & 0x07ff) << 1),
14011393 24);
1402− r->r_addend = offset + sym->st_value + 4;
1403− break;
1404− default:
1405− r->r_addend = (Elf_Addr)(-1);
1394+ return offset + sym->st_value + 4;
14061395 }
1407− return 0;
1396+
1397+ return (Elf_Addr)(-1);
14081398 }
14091399
1410−static int addend_mips_rel(uint32_t *location, Elf_Rela *r)
1400+static Elf_Addr addend_mips_rel(uint32_t *location, Elf_Rela *r)
14111401 {
14121402 unsigned int r_typ = ELF_R_TYPE(r->r_info);
14131403 uint32_t inst;
@@ -1415,18 +1405,13 @@ static int addend_mips_rel(uint32_t *location, Elf_Rela *r) · 1 unmodified line
14151405 inst = TO_NATIVE(*location);
14161406 switch (r_typ) {
14171407 case R_MIPS_LO16:
1418− r->r_addend = inst & 0xffff;
1419− break;
1408+ return inst & 0xffff;
14201409 case R_MIPS_26:
1421− r->r_addend = (inst & 0x03ffffff) << 2;
1422− break;
1410+ return (inst & 0x03ffffff) << 2;
14231411 case R_MIPS_32:
1424− r->r_addend = inst;
1425− break;
1426− default:
1427− r->r_addend = (Elf_Addr)(-1);
1412+ return inst;
14281413 }
1429− return 0;
1414+ return (Elf_Addr)(-1);
14301415 }
14311416
14321417 #ifndef EM_RISCV
@@ -1513,6 +1498,7 @@ static void section_rel(struct module *mod, struct elf_info *elf, · 80 unmodified lines
15131498
15141499 for (rel = start; rel < stop; rel++) {
15151500 Elf_Sym *tsym;
1501+ Elf_Addr taddr = 0;
15161502 void *loc;
15171503
15181504 r.r_offset = TO_NATIVE(rel->r_offset);
@@ -1531,27 +1517,26 @@ static void section_rel(struct module *mod, struct elf_info *elf, · 12 unmodified lines
15311517 r.r_info = TO_NATIVE(rel->r_info);
15321518 r_sym = ELF_R_SYM(r.r_info);
15331519 #endif
1534− r.r_addend = 0;
15351520
15361521 loc = sym_get_data_by_offset(elf, fsecndx, r.r_offset);
15371522 tsym = elf->symtab_start + r_sym;
15381523
15391524 switch (elf->hdr->e_machine) {
15401525 case EM_386:
1541− addend_386_rel(loc, &r);
1526+ taddr = addend_386_rel(loc, &r);
15421527 break;
15431528 case EM_ARM:
1544− addend_arm_rel(loc, tsym, &r);
1529+ taddr = addend_arm_rel(loc, tsym, &r);
15451530 break;
15461531 case EM_MIPS:
1547− addend_mips_rel(loc, &r);
1532+ taddr = addend_mips_rel(loc, &r);
15481533 break;
15491534 default:
15501535 fatal("Please add code to calculate addend for this architecture\n");
15511536 }
15521537
15531538 check_section_mismatch(mod, elf, tsym,
1554− fsecndx, fromsec, r.r_offset, r.r_addend);
1539+ fsecndx, fromsec, r.r_offset, taddr);
15551540 }
15561541 }
15571542

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t