diff options
| -rw-r--r-- | softmmu_template.h | 2 | ||||
| -rw-r--r-- | vl.c | 14 |
2 files changed, 9 insertions, 7 deletions
diff --git a/softmmu_template.h b/softmmu_template.h index a0a2c38ab6..45fcd4e1b6 100644 --- a/softmmu_template.h +++ b/softmmu_template.h @@ -282,6 +282,8 @@ static void glue(glue(slow_st, SUFFIX), MMUSUFFIX)(target_ulong addr, } else if (((addr & ~TARGET_PAGE_MASK) + DATA_SIZE - 1) >= TARGET_PAGE_SIZE) { do_unaligned_access: /* XXX: not efficient, but simple */ + /* Note: relies on the fact that tlb_fill() does not remove the + * previous page from the TLB cache. */ for(i = DATA_SIZE - 1; i >= 0; i--) { #ifdef TARGET_WORDS_BIGENDIAN glue(slow_stb, MMUSUFFIX)(addr + i, val >> (((DATA_SIZE - 1) * 8) - (i * 8)), @@ -8256,20 +8256,20 @@ int main(int argc, char **argv) #endif linux_boot = (kernel_filename != NULL); net_boot = (boot_devices_bitmap >> ('n' - 'a')) && 0xF; - + /* XXX: this should not be: some embedded targets just have flash */ if (!linux_boot && net_boot == 0 && - hd_filename[0] == '\0' && - (cdrom_index >= 0 && hd_filename[cdrom_index] == '\0') && - fd_filename[0] == '\0' && - pflash_filename[0] == '\0') + hd_filename[0] == NULL && + (cdrom_index >= 0 && hd_filename[cdrom_index] == NULL) && + fd_filename[0] == NULL && + pflash_filename[0] == NULL) help(1); /* boot to floppy or the default cd if no hard disk defined yet */ if (!boot_devices[0]) { - if (hd_filename[0] != '\0') + if (hd_filename[0] != NULL) boot_devices = "c"; - else if (fd_filename[0] != '\0') + else if (fd_filename[0] != NULL) boot_devices = "a"; else boot_devices = "d"; |