d0p1/tcc-stupidos
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ARM: allow jumps > 32MB on -run

Browse source 
This is needed to reach tinycc's PLT from the compiled program.
This commit is contained in:
Daniel Glöckner 2010-05-14 13:07:59 +02:00
parent a64727ba7d
commit 741841d863
3 changed files with 19 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tcc.h
View file

@ -547,7 +547,7 @@ struct TCCState {
#endif #endif
#ifndef TCC_TARGET_PE #ifndef TCC_TARGET_PE
#ifdef TCC_TARGET_X86_64 #if defined TCC_TARGET_X86_64 || defined TCC_TARGET_ARM
/* write PLT and GOT here */ /* write PLT and GOT here */
char *runtime_plt_and_got; char *runtime_plt_and_got;
unsigned int runtime_plt_and_got_offset; unsigned int runtime_plt_and_got_offset;

16
tccelf.c
View file

@ -504,6 +504,17 @@ static uplong add_got_table(TCCState *s1, uplong val)
*p = val; *p = val;
return (uplong)p; return (uplong)p;
} }
#elif defined TCC_TARGET_ARM
#define JMP_TABLE_ENTRY_SIZE 8
static int add_jmp_table(TCCState *s1, int val)
{
uint32_t *p = (uint32_t *)(s1->runtime_plt_and_got + s1->runtime_plt_and_got_offset);
s1->runtime_plt_and_got_offset += JMP_TABLE_ENTRY_SIZE;
/* ldr pc, [pc, #-4] */
p[0] = 0xE51FF004;
p[1] = val;
return (int)p;
}
#endif #endif
#endif #endif
@ -611,6 +622,11 @@ ST_FUNC void relocate_section(TCCState *s1, Section *s)
x -= 0x1000000; x -= 0x1000000;
x *= 4; x *= 4;
x += val - addr; x += val - addr;
#ifndef TCC_TARGET_PE
if((x & 3) != 0 || x >= 0x4000000 || x < -0x4000000)
if (s1->output_type == TCC_OUTPUT_MEMORY)
x += add_jmp_table(s1, val) - val; /* add veneer */
#endif
if((x & 3) != 0 || x >= 0x4000000 || x < -0x4000000) if((x & 3) != 0 || x >= 0x4000000 || x < -0x4000000)
error("can't relocate value at %x",addr); error("can't relocate value at %x",addr);
x >>= 2; x >>= 2;

4
tccrun.c
View file

@ -150,7 +150,7 @@ static int tcc_relocate_ex(TCCState *s1, void *ptr)
if (s1->nb_errors) if (s1->nb_errors)
return -1; return -1;
#if defined TCC_TARGET_X86_64 && !defined TCC_TARGET_PE #if (defined TCC_TARGET_X86_64 || defined TCC_TARGET_ARM) && !defined TCC_TARGET_PE
s1->runtime_plt_and_got_offset = 0; s1->runtime_plt_and_got_offset = 0;
s1->runtime_plt_and_got = (char *)(mem + offset); s1->runtime_plt_and_got = (char *)(mem + offset);
/* double the size of the buffer for got and plt entries /* double the size of the buffer for got and plt entries
@ -184,7 +184,7 @@ static int tcc_relocate_ex(TCCState *s1, void *ptr)
set_pages_executable(ptr, length); set_pages_executable(ptr, length);
} }
#if defined TCC_TARGET_X86_64 && !defined TCC_TARGET_PE #if (defined TCC_TARGET_X86_64 || defined TCC_TARGET_ARM) && !defined TCC_TARGET_PE
set_pages_executable(s1->runtime_plt_and_got, set_pages_executable(s1->runtime_plt_and_got,
s1->runtime_plt_and_got_offset); s1->runtime_plt_and_got_offset);
#endif #endif