tccelf/tcccoff: fix some type conversion warnings

This commit is contained in:
grischka 2010-12-04 16:48:15 +01:00
parent 86ffc48129
commit 21c2a68aa0
2 changed files with 7 additions and 7 deletions

View File

@ -943,7 +943,7 @@ ST_FUNC int tcc_load_coff(TCCState * s1, int fd)
if (name[0] == '_' && strcmp(name, "_main") != 0) if (name[0] == '_' && strcmp(name, "_main") != 0)
name++; name++;
tcc_add_symbol(s1, name, (void*)csym.n_value); tcc_add_symbol(s1, name, (void*)(uplong)csym.n_value);
} }
// skip any aux records // skip any aux records

View File

@ -506,14 +506,14 @@ static uplong add_got_table(TCCState *s1, uplong val)
} }
#elif defined TCC_TARGET_ARM #elif defined TCC_TARGET_ARM
#define JMP_TABLE_ENTRY_SIZE 8 #define JMP_TABLE_ENTRY_SIZE 8
static int add_jmp_table(TCCState *s1, int val) static uplong add_jmp_table(TCCState *s1, int val)
{ {
uint32_t *p = (uint32_t *)(s1->runtime_plt_and_got + s1->runtime_plt_and_got_offset); 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; s1->runtime_plt_and_got_offset += JMP_TABLE_ENTRY_SIZE;
/* ldr pc, [pc, #-4] */ /* ldr pc, [pc, #-4] */
p[0] = 0xE51FF004; p[0] = 0xE51FF004;
p[1] = val; p[1] = val;
return (int)p; return (uplong)p;
} }
#endif #endif
#endif #endif
@ -666,8 +666,8 @@ ST_FUNC void relocate_section(TCCState *s1, Section *s)
*(int*)ptr ^= 0xE12FFF10 ^ 0xE1A0F000; /* BX Rm -> MOV PC, Rm */ *(int*)ptr ^= 0xE12FFF10 ^ 0xE1A0F000; /* BX Rm -> MOV PC, Rm */
break; break;
default: default:
fprintf(stderr,"FIXME: handle reloc type %x at %lx [%.8x] to %lx\n", fprintf(stderr,"FIXME: handle reloc type %x at %x [%.8x] to %x\n",
type,addr,(unsigned int)(long)ptr,val); type, (unsigned)addr, (unsigned)(uplong)ptr, (unsigned)val);
break; break;
#elif defined(TCC_TARGET_C67) #elif defined(TCC_TARGET_C67)
case R_C60_32: case R_C60_32:
@ -692,8 +692,8 @@ ST_FUNC void relocate_section(TCCState *s1, Section *s)
case R_C60HI16: case R_C60HI16:
break; break;
default: default:
fprintf(stderr,"FIXME: handle reloc type %x at %lx [%.8x] to %lx\n", fprintf(stderr,"FIXME: handle reloc type %x at %x [%.8x] to %x\n",
type,addr,(unsigned int)(long)ptr, val); type, (unsigned)addr, (unsigned)(uplong)ptr, (unsigned)val);
break; break;
#elif defined(TCC_TARGET_X86_64) #elif defined(TCC_TARGET_X86_64)
case R_X86_64_64: case R_X86_64_64: