projects
/
qemu
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of /home/nchip/public_html/qemu into garage-push
[qemu]
/
elf_ops.h
diff --git
a/elf_ops.h
b/elf_ops.h
index
485442a
..
72cd83e
100644
(file)
--- a/
elf_ops.h
+++ b/
elf_ops.h
@@
-185,7
+185,7
@@
static int glue(load_elf, SZ)(int fd, int64_t address_offset,
struct elf_phdr *phdr = NULL, *ph;
int size, i, total_size;
elf_word mem_size;
struct elf_phdr *phdr = NULL, *ph;
int size, i, total_size;
elf_word mem_size;
- uint64_t addr, low = 0, high = 0;
+ uint64_t addr, low = (uint64_t)-1, high = 0;
uint8_t *data = NULL;
if (read(fd, &ehdr, sizeof(ehdr)) != sizeof(ehdr))
uint8_t *data = NULL;
if (read(fd, &ehdr, sizeof(ehdr)) != sizeof(ehdr))
@@
-249,9
+249,9
@@
static int glue(load_elf, SZ)(int fd, int64_t address_offset,
cpu_physical_memory_write_rom(addr, data, mem_size);
total_size += mem_size;
cpu_physical_memory_write_rom(addr, data, mem_size);
total_size += mem_size;
- if (!low || addr < low)
+ if (addr < low)
low = addr;
low = addr;
- if (!high || (addr + mem_size) > high)
+ if ((addr + mem_size) > high)
high = addr + mem_size;
qemu_free(data);
high = addr + mem_size;
qemu_free(data);