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

m68k: do not use ram_size global 

Use the machine properties instead.

Cc: Laurent Vivier <lvivier@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2020-10-28 06:15:40 -04:00
parent 86378b29fa
commit 5601d24164
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hw/m68k/mcf5206.c
View File

@ -10,6 +10,7 @@
#include "qemu/error-report.h" #include "qemu/error-report.h"
#include "qemu/log.h" #include "qemu/log.h"
#include "cpu.h" #include "cpu.h"
#include "hw/boards.h"
#include "hw/irq.h" #include "hw/irq.h"
#include "hw/m68k/mcf.h" #include "hw/m68k/mcf.h"
#include "qemu/timer.h" #include "qemu/timer.h"
@ -312,8 +313,9 @@ static uint64_t m5206_mbar_read(m5206_mbar_state *s,
/* FIXME: currently hardcoded to 128Mb. */ /* FIXME: currently hardcoded to 128Mb. */
{ {
uint32_t mask = ~0; uint32_t mask = ~0;
while (mask > ram_size) while (mask > current_machine->ram_size) {
mask >>= 1; mask >>= 1;
}
return mask & 0x0ffe0000; return mask & 0x0ffe0000;
} }
case 0x5c: return 1; /* DRAM bank 1 empty. */ case 0x5c: return 1; /* DRAM bank 1 empty. */

3
hw/m68k/mcf5208.c
View File

@ -157,8 +157,9 @@ static uint64_t m5208_sys_read(void *opaque, hwaddr addr,
{ {
int n; int n;
for (n = 0; n < 32; n++) { for (n = 0; n < 32; n++) {
if (ram_size < (2u << n)) if (current_machine->ram_size < (2u << n)) {
break; break;
}
} }
return (n - 1) | 0x40000000; return (n - 1) | 0x40000000;
} }

5
target/m68k/m68k-semi.c
View File

@ -26,6 +26,7 @@
#else #else
#include "exec/gdbstub.h" #include "exec/gdbstub.h"
#include "exec/softmmu-semi.h" #include "exec/softmmu-semi.h"
#include "hw/boards.h"
#endif #endif
#include "qemu/log.h" #include "qemu/log.h"
@ -455,8 +456,8 @@ void do_m68k_semihosting(CPUM68KState *env, int nr)
* FIXME: This is wrong for boards where RAM does not start at * FIXME: This is wrong for boards where RAM does not start at
* address zero. * address zero.
*/ */
env->dregs[1] = ram_size; env->dregs[1] = current_machine->ram_size;
env->aregs[7] = ram_size; env->aregs[7] = current_machine->ram_size;
#endif #endif
return; return;
default: default: