diff options
| author | Philippe Mathieu-Daudé | 2020-12-06 20:29:00 +0100 |
|---|---|---|
| committer | Philippe Mathieu-Daudé | 2020-12-13 19:58:54 +0100 |
| commit | 2fd9c5ad4449c862932b21e8f6b4573cc50b9ae8 (patch) | |
| tree | 44ea62b782d76e76685ad82d98701a05ec4be8b0 /hw | |
| parent | target/mips: Introduce cpu_supports_isa() taking CPUMIPSState argument (diff) | |
| download | qemu-2fd9c5ad4449c862932b21e8f6b4573cc50b9ae8.tar.gz qemu-2fd9c5ad4449c862932b21e8f6b4573cc50b9ae8.tar.xz qemu-2fd9c5ad4449c862932b21e8f6b4573cc50b9ae8.zip | |
hw/mips: Move address translation helpers to target/mips/
Address translation is an architectural thing (not hardware
related). Move the helpers from hw/ to target/.
As physical address and KVM are specific to system mode
emulation, restrict this file to softmmu, so it doesn't
get compiled for user-mode emulation.
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20201206233949.3783184-2-f4bug@amsat.org>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/mips/addr.c | 51 | ||||
| -rw-r--r-- | hw/mips/boston.c | 1 | ||||
| -rw-r--r-- | hw/mips/meson.build | 2 |
3 files changed, 1 insertions, 53 deletions
diff --git a/hw/mips/addr.c b/hw/mips/addr.c deleted file mode 100644 index 2f138fe1ea..0000000000 --- a/hw/mips/addr.c +++ /dev/null @@ -1,51 +0,0 @@ -/* - * QEMU MIPS address translation support - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ - -#include "qemu/osdep.h" -#include "hw/mips/cpudevs.h" - -static int mips_um_ksegs; - -uint64_t cpu_mips_kseg0_to_phys(void *opaque, uint64_t addr) -{ - return addr & 0x1fffffffll; -} - -uint64_t cpu_mips_phys_to_kseg0(void *opaque, uint64_t addr) -{ - return addr | ~0x7fffffffll; -} - -uint64_t cpu_mips_kvm_um_phys_to_kseg0(void *opaque, uint64_t addr) -{ - return addr | 0x40000000ll; -} - -bool mips_um_ksegs_enabled(void) -{ - return mips_um_ksegs; -} - -void mips_um_ksegs_enable(void) -{ - mips_um_ksegs = 1; -} diff --git a/hw/mips/boston.c b/hw/mips/boston.c index 16467ea475..c3b94c68e1 100644 --- a/hw/mips/boston.c +++ b/hw/mips/boston.c @@ -28,7 +28,6 @@ #include "hw/loader.h" #include "hw/loader-fit.h" #include "hw/mips/cps.h" -#include "hw/mips/cpudevs.h" #include "hw/pci-host/xilinx-pcie.h" #include "hw/qdev-clock.h" #include "hw/qdev-properties.h" diff --git a/hw/mips/meson.build b/hw/mips/meson.build index bcdf96be69..77b4d8f365 100644 --- a/hw/mips/meson.build +++ b/hw/mips/meson.build @@ -1,5 +1,5 @@ mips_ss = ss.source_set() -mips_ss.add(files('addr.c', 'mips_int.c')) +mips_ss.add(files('mips_int.c')) mips_ss.add(when: 'CONFIG_FULOONG', if_true: files('fuloong2e.c')) mips_ss.add(when: 'CONFIG_JAZZ', if_true: files('jazz.c')) mips_ss.add(when: 'CONFIG_MALTA', if_true: files('gt64xxx_pci.c', 'malta.c')) |