danog/ir
1
0
Fork 0
mirror of https://github.com/danog/ir.git synced 2024-11-30 04:39:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix MSVC compilation warnings

Browse Source
This commit is contained in:
Dmitry Stogov 2023-03-01 14:18:06 +03:00
parent e2810c070e
commit e9a4b5efeb
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
ir_disasm.c
View File

@ -390,9 +390,11 @@ int ir_disasm(const char *name,
} }
jmp_table_offset = ctx->jmp_table_offset; jmp_table_offset = ctx->jmp_table_offset;
if (jmp_table_offset) { if (jmp_table_offset) {
uint32_t n = orig_size - jmp_table_offset; uint32_t n;
uintptr_t *p; uintptr_t *p;
IR_ASSERT(orig_size - jmp_table_offset <= 0xffffffff);
n = (uint32_t)(orig_size - jmp_table_offset);
if (size > jmp_table_offset) { if (size > jmp_table_offset) {
size = jmp_table_offset; size = jmp_table_offset;
} }
@ -514,7 +516,9 @@ int ir_disasm(const char *name,
if (r > p && *r == 'x' && *(r - 1) == '0') { if (r > p && *r == 'x' && *(r - 1) == '0') {
r -= 2; r -= 2;
} }
fwrite(p, 1, r - p, f); if (r > p) {
fwrite(p, 1, r - p, f);
}
if (entry >= 0) { if (entry >= 0) {
fprintf(f, ".ENTRY_%d%s\n", entry, q); fprintf(f, ".ENTRY_%d%s\n", entry, q);
} else { } else {
@ -548,7 +552,7 @@ int ir_disasm(const char *name,
} }
if (p != q && *(q-1) == '-') { if (p != q && *(q-1) == '-') {
q--; q--;
addr = (uint32_t)(-addr); addr = (uint32_t)(-(int64_t)addr);
} }
if (addr >= (uint64_t)(uintptr_t)start && addr < (uint64_t)(uintptr_t)orig_end) { if (addr >= (uint64_t)(uintptr_t)start && addr < (uint64_t)(uintptr_t)orig_end) {
entry = ir_hashtab_find(&labels, (uint32_t)((uintptr_t)addr - (uintptr_t)start)); entry = ir_hashtab_find(&labels, (uint32_t)((uintptr_t)addr - (uintptr_t)start));
@ -559,11 +563,13 @@ int ir_disasm(const char *name,
} else { } else {
fprintf(f, ".L%d", -entry); fprintf(f, ".L%d", -entry);
} }
} else { } else if (r > p) {
fwrite(p, 1, r - p, f); fwrite(p, 1, r - p, f);
} }
} else if ((sym = ir_disasm_resolver(addr, &offset))) { } else if ((sym = ir_disasm_resolver(addr, &offset))) {
fwrite(p, 1, q - p, f); if (q > p) {
fwrite(p, 1, q - p, f);
}
fputs(sym, f); fputs(sym, f);
if (offset != 0) { if (offset != 0) {
if (offset > 0) { if (offset > 0) {
@ -572,7 +578,7 @@ int ir_disasm(const char *name,
fprintf(f, "-%" PRIx64, offset); fprintf(f, "-%" PRIx64, offset);
} }
} }
} else { } else if (r > p) {
fwrite(p, 1, r - p, f); fwrite(p, 1, r - p, f);
} }
p = r; p = r;
@ -590,7 +596,9 @@ int ir_disasm(const char *name,
} }
if (rodata_offset) { if (rodata_offset) {
const unsigned char *p = (unsigned char*)start + rodata_offset; const unsigned char *p = (unsigned char*)start + rodata_offset;
uint32_t n = jmp_table_offset ? (jmp_table_offset - rodata_offset) : (orig_size - rodata_offset); uint32_t n = jmp_table_offset ?
(uint32_t)(jmp_table_offset - rodata_offset) :
(uint32_t)(orig_size - rodata_offset);
uint32_t j; uint32_t j;
while (n > 0) { while (n > 0) {
@ -621,7 +629,7 @@ int ir_disasm(const char *name,
} }
if (jmp_table_offset) { if (jmp_table_offset) {
uintptr_t *p = (uintptr_t*)(unsigned char*)start + jmp_table_offset; uintptr_t *p = (uintptr_t*)(unsigned char*)start + jmp_table_offset;
uint32_t n = orig_size - jmp_table_offset; uint32_t n = (uint32_t)(orig_size - jmp_table_offset);
fprintf(f, ".align %d\n", (int)sizeof(void*)); fprintf(f, ".align %d\n", (int)sizeof(void*));