diff options
| author | Faraz Shahbazker <fshahbazker@wavecomp.com> | 2021-05-05 04:51:17 +0530 |
|---|---|---|
| committer | Faraz Shahbazker <fshahbazker@wavecomp.com> | 2021-05-22 11:32:35 +0530 |
| commit | 168671c14cc88e0c47a2b7d56fdede7d6604f14d (patch) | |
| tree | 2138d04ffeb0e58865490c1382bc28510825b34f /sim/mips | |
| parent | b312488f1046a1b837561a4adf4323e29377cf12 (diff) | |
| download | fsf-binutils-gdb-168671c14cc88e0c47a2b7d56fdede7d6604f14d.zip fsf-binutils-gdb-168671c14cc88e0c47a2b7d56fdede7d6604f14d.tar.gz fsf-binutils-gdb-168671c14cc88e0c47a2b7d56fdede7d6604f14d.tar.bz2 | |
sim: mips: Add shadow mappings for 32-bit memory address space
32-bit MIPS programs run on the 64-bit simulator model in 64-bit
sign-extended space. The mapping from 64-bit sign-extended addresses to
32-bit addresses was removed by commit
26f8bf63bf36f9062a5cc1afacf71462a4abe0c8, breaking the 64-bit simulator
model. Add shadow mappings from 64-bit sign extended address space to
32-bit address spaces, in lieu of the AddressTranslation function.
2021-05-04 Faraz Shahbazker <fshahbazker@wavecomp.com>
sim/mips/ChangeLog:
* interp.c (sim_open): Add shadow mappings from 32-bit
address space to 64-bit sign-extended address space.
Diffstat (limited to 'sim/mips')
| -rw-r--r-- | sim/mips/ChangeLog | 6 | ||||
| -rw-r--r-- | sim/mips/interp.c | 14 |
2 files changed, 17 insertions, 3 deletions
diff --git a/sim/mips/ChangeLog b/sim/mips/ChangeLog index 123d722..0d687a9 100644 --- a/sim/mips/ChangeLog +++ b/sim/mips/ChangeLog @@ -1,6 +1,12 @@ 2021-05-22 Faraz Shahbazker <fshahbazker@wavecomp.com> sim/mips/ChangeLog: + * interp.c (sim_open): Add shadow mappings from 32-bit + address space to 64-bit sign-extended address space. + +2021-05-22 Faraz Shahbazker <fshahbazker@wavecomp.com> + +sim/mips/ChangeLog: * interp.c (sim_create_inferior): Only truncate sign extension bits for 32-bit target models. diff --git a/sim/mips/interp.c b/sim/mips/interp.c index 6e00fd0..00c1b63 100644 --- a/sim/mips/interp.c +++ b/sim/mips/interp.c @@ -438,6 +438,9 @@ sim_open (SIM_OPEN_KIND kind, host_callback *cb, /* memory alias K1BASE@1,K1SIZE%MEMSIZE,K0BASE */ sim_do_commandf (sd, "memory alias 0x%lx@1,0x%lx%%0x%lx,0x%0x", K1BASE, K1SIZE, (long)mem_size, K0BASE); + if (WITH_TARGET_WORD_BITSIZE == 64) + sim_do_commandf (sd, "memory alias 0x%x,0x%" PRIxTW ",0x%" PRIxTA, + (K0BASE), mem_size, EXTENDED(K0BASE)); } device_init(sd); @@ -696,11 +699,16 @@ sim_open (SIM_OPEN_KIND kind, host_callback *cb, if (idt_monitor_base != 0) { unsigned loop; - unsigned idt_monitor_size = 1 << 11; + address_word idt_monitor_size = 1 << 11; /* the default monitor region */ - sim_do_commandf (sd, "memory region 0x%x,0x%x", - idt_monitor_base, idt_monitor_size); + if (WITH_TARGET_WORD_BITSIZE == 64) + sim_do_commandf (sd, "memory alias 0x%x,0x%" PRIxTW ",0x%" PRIxTA, + idt_monitor_base, idt_monitor_size, + EXTENDED (idt_monitor_base)); + else + sim_do_commandf (sd, "memory region 0x%x,0x%x", + idt_monitor_base, idt_monitor_size); /* Entry into the IDT monitor is via fixed address vectors, and not using machine instructions. To avoid clashing with use of |