ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

kernel command line support (Daniel Jacobowitz) 

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1687 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
bellard 2005-12-05 19:56:38 +00:00
parent 30d6cb8479
commit 2d7272a588
1 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
hw/mips_r4k.c
View File

@ -53,7 +53,7 @@ static void cpu_mips_update_count (CPUState *env, uint32_t count,
next = now + muldiv64(compare - tmp, ticks_per_sec, 100 * 1000 * 1000); next = now + muldiv64(compare - tmp, ticks_per_sec, 100 * 1000 * 1000);
if (next == now) if (next == now)
next++; next++;
#if 1 #if 0
if (logfile) { if (logfile) {
fprintf(logfile, "%s: 0x%08llx %08x %08x => 0x%08llx\n", fprintf(logfile, "%s: 0x%08llx %08x %08x => 0x%08llx\n",
__func__, now, count, compare, next - now); __func__, now, count, compare, next - now);
@ -84,7 +84,7 @@ static void mips_timer_cb (void *opaque)
CPUState *env; CPUState *env;
env = opaque; env = opaque;
#if 1 #if 0
if (logfile) { if (logfile) {
fprintf(logfile, "%s\n", __func__); fprintf(logfile, "%s\n", __func__);
} }
@ -103,23 +103,29 @@ void cpu_mips_clock_init (CPUState *env)
static void io_writeb (void *opaque, target_phys_addr_t addr, uint32_t value) static void io_writeb (void *opaque, target_phys_addr_t addr, uint32_t value)
{ {
#if 0
if (logfile) if (logfile)
fprintf(logfile, "%s: addr %08x val %08x\n", __func__, addr, value); fprintf(logfile, "%s: addr %08x val %08x\n", __func__, addr, value);
#endif
cpu_outb(NULL, addr & 0xffff, value); cpu_outb(NULL, addr & 0xffff, value);
} }
static uint32_t io_readb (void *opaque, target_phys_addr_t addr) static uint32_t io_readb (void *opaque, target_phys_addr_t addr)
{ {
uint32_t ret = cpu_inb(NULL, addr & 0xffff); uint32_t ret = cpu_inb(NULL, addr & 0xffff);
#if 0
if (logfile) if (logfile)
fprintf(logfile, "%s: addr %08x val %08x\n", __func__, addr, ret); fprintf(logfile, "%s: addr %08x val %08x\n", __func__, addr, ret);
#endif
return ret; return ret;
} }
static void io_writew (void *opaque, target_phys_addr_t addr, uint32_t value) static void io_writew (void *opaque, target_phys_addr_t addr, uint32_t value)
{ {
#if 0
if (logfile) if (logfile)
fprintf(logfile, "%s: addr %08x val %08x\n", __func__, addr, value); fprintf(logfile, "%s: addr %08x val %08x\n", __func__, addr, value);
#endif
#ifdef TARGET_WORDS_BIGENDIAN #ifdef TARGET_WORDS_BIGENDIAN
value = bswap16(value); value = bswap16(value);
#endif #endif
@ -132,15 +138,19 @@ static uint32_t io_readw (void *opaque, target_phys_addr_t addr)
#ifdef TARGET_WORDS_BIGENDIAN #ifdef TARGET_WORDS_BIGENDIAN
ret = bswap16(ret); ret = bswap16(ret);
#endif #endif
#if 0
if (logfile) if (logfile)
fprintf(logfile, "%s: addr %08x val %08x\n", __func__, addr, ret); fprintf(logfile, "%s: addr %08x val %08x\n", __func__, addr, ret);
#endif
return ret; return ret;
} }
static void io_writel (void *opaque, target_phys_addr_t addr, uint32_t value) static void io_writel (void *opaque, target_phys_addr_t addr, uint32_t value)
{ {
#if 0
if (logfile) if (logfile)
fprintf(logfile, "%s: addr %08x val %08x\n", __func__, addr, value); fprintf(logfile, "%s: addr %08x val %08x\n", __func__, addr, value);
#endif
#ifdef TARGET_WORDS_BIGENDIAN #ifdef TARGET_WORDS_BIGENDIAN
value = bswap32(value); value = bswap32(value);
#endif #endif
@ -154,8 +164,10 @@ static uint32_t io_readl (void *opaque, target_phys_addr_t addr)
#ifdef TARGET_WORDS_BIGENDIAN #ifdef TARGET_WORDS_BIGENDIAN
ret = bswap32(ret); ret = bswap32(ret);
#endif #endif
#if 0
if (logfile) if (logfile)
fprintf(logfile, "%s: addr %08x val %08x\n", __func__, addr, ret); fprintf(logfile, "%s: addr %08x val %08x\n", __func__, addr, ret);
#endif
return ret; return ret;
} }
@ -233,6 +245,11 @@ void mips_r4k_init (int ram_size, int vga_ram_size, int boot_device,
initrd_size = 0; initrd_size = 0;
} }
env->PC = KERNEL_LOAD_ADDR; env->PC = KERNEL_LOAD_ADDR;
/* Store command line. */
strcpy (phys_ram_base + (16 << 20) - 256, kernel_cmdline);
/* FIXME: little endian support */
*(int *)(phys_ram_base + (16 << 20) - 260) = tswap32 (0x12345678);
*(int *)(phys_ram_base + (16 << 20) - 264) = tswap32 (ram_size);
} else { } else {
kernel_base = 0; kernel_base = 0;
kernel_size = 0; kernel_size = 0;