mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-04 08:13:54 -06:00
RISC-V: QEMU 2.13 Privileged ISA emulation updates
Several code cleanups, minor specification conformance changes, fixes to make ROM read-only and add device-tree size checks. * Honour privileged ISA v1.10 counter enable CSRs. * Implements WARL behavior for CSRs that don't support writes * Past behavior of raising traps was non-conformant with the RISC-V Privileged ISA Specification v1.10. * Allow S-mode access to sstatus.MXR when priv ISA >= v1.10 * Sets mtval/stval to zero on exceptions without addresses * Past behavior of leaving the last value was non-conformant with the RISC-V Privileged ISA Specition v1.10. mtval/stval must be set on all exceptions; to zero if not supported. * Make ROMs read-only and implement device-tree size checks * Uses memory_region_init_rom and rom_add_blob_fixed_as * Adds hexidecimal instruction bytes to disassembly output. * Fixes missing break statement for rv128 disassembly. * Several code cleanups * Replacing hard-coded constants with enums * Dead-code elimination This is an incremental pull that contains 20 reviewed changes out of 38 changes currently queued in the qemu-2.13-for-upstream branch. -----BEGIN PGP SIGNATURE----- iF0EABECAB0WIQR8mZMOsXzYugc9Xvpr8dezV+8+TwUCWu496QAKCRBr8dezV+8+ T1ZEAJ4wQRHZtn4suN5yMEHQMA2FkX1iNACgiYWLtcNcgoa88eaTcJJJu4QZryY= =I2wf -----END PGP SIGNATURE----- Merge remote-tracking branch 'remotes/riscv/tags/riscv-qemu-2.13-pull-20180506' into staging RISC-V: QEMU 2.13 Privileged ISA emulation updates Several code cleanups, minor specification conformance changes, fixes to make ROM read-only and add device-tree size checks. * Honour privileged ISA v1.10 counter enable CSRs. * Implements WARL behavior for CSRs that don't support writes * Past behavior of raising traps was non-conformant with the RISC-V Privileged ISA Specification v1.10. * Allow S-mode access to sstatus.MXR when priv ISA >= v1.10 * Sets mtval/stval to zero on exceptions without addresses * Past behavior of leaving the last value was non-conformant with the RISC-V Privileged ISA Specition v1.10. mtval/stval must be set on all exceptions; to zero if not supported. * Make ROMs read-only and implement device-tree size checks * Uses memory_region_init_rom and rom_add_blob_fixed_as * Adds hexidecimal instruction bytes to disassembly output. * Fixes missing break statement for rv128 disassembly. * Several code cleanups * Replacing hard-coded constants with enums * Dead-code elimination This is an incremental pull that contains 20 reviewed changes out of 38 changes currently queued in the qemu-2.13-for-upstream branch. # gpg: Signature made Sun 06 May 2018 00:27:37 BST # gpg: using DSA key 6BF1D7B357EF3E4F # gpg: Good signature from "Michael Clark <michaeljclark@mac.com>" # gpg: aka "Michael Clark <mjc@sifive.com>" # gpg: aka "Michael Clark <michael@metaparadigm.com>" # gpg: WARNING: This key is not certified with a trusted signature! # gpg: There is no indication that the signature belongs to the owner. # Primary key fingerprint: 7C99 930E B17C D8BA 073D 5EFA 6BF1 D7B3 57EF 3E4F * remotes/riscv/tags/riscv-qemu-2.13-pull-20180506: RISC-V: Mark ROM read-only after copying in code RISC-V: No traps on writes to misa,minstret,mcycle RISC-V: Make mtvec/stvec ignore vectored traps RISC-V: Add mcycle/minstret support for -icount auto RISC-V: Use [ms]counteren CSRs when priv ISA >= v1.10 RISC-V: Allow S-mode mxr access when priv ISA >= v1.10 RISC-V: Clear mtval/stval on exceptions without info RISC-V: Hardwire satp to 0 for no-mmu case RISC-V: Update E and I extension order RISC-V: Remove erroneous comment from translate.c RISC-V: Remove EM_RISCV ELF_MACHINE indirection RISC-V: Make virt header comment title consistent RISC-V: Make some header guards more specific RISC-V: Fix missing break statement in disassembler RISC-V: Include instruction hex in disassembly RISC-V: Remove unused class definitions RISC-V: Remove identity_translate from load_elf RISC-V: Use ROM base address and size from memmap RISC-V: Make virt board description match spike RISC-V: Replace hardcoded constants with enum values Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
commit
3add3f7edc
17 changed files with 287 additions and 318 deletions
|
@ -47,4 +47,8 @@ enum {
|
|||
SIFIVE_TIME_BASE = 0xBFF8
|
||||
};
|
||||
|
||||
enum {
|
||||
SIFIVE_CLINT_TIMEBASE_FREQ = 10000000
|
||||
};
|
||||
|
||||
#endif
|
||||
|
|
|
@ -19,11 +19,6 @@
|
|||
#ifndef HW_SIFIVE_E_H
|
||||
#define HW_SIFIVE_E_H
|
||||
|
||||
#define TYPE_SIFIVE_E "riscv.sifive_e"
|
||||
|
||||
#define SIFIVE_E(obj) \
|
||||
OBJECT_CHECK(SiFiveEState, (obj), TYPE_SIFIVE_E)
|
||||
|
||||
typedef struct SiFiveEState {
|
||||
/*< private >*/
|
||||
SysBusDevice parent_obj;
|
||||
|
|
|
@ -19,11 +19,6 @@
|
|||
#ifndef HW_SIFIVE_U_H
|
||||
#define HW_SIFIVE_U_H
|
||||
|
||||
#define TYPE_SIFIVE_U "riscv.sifive_u"
|
||||
|
||||
#define SIFIVE_U(obj) \
|
||||
OBJECT_CHECK(SiFiveUState, (obj), TYPE_SIFIVE_U)
|
||||
|
||||
typedef struct SiFiveUState {
|
||||
/*< private >*/
|
||||
SysBusDevice parent_obj;
|
||||
|
@ -50,6 +45,10 @@ enum {
|
|||
SIFIVE_U_UART1_IRQ = 4
|
||||
};
|
||||
|
||||
enum {
|
||||
SIFIVE_U_CLOCK_FREQ = 1000000000
|
||||
};
|
||||
|
||||
#define SIFIVE_U_PLIC_HART_CONFIG "MS"
|
||||
#define SIFIVE_U_PLIC_NUM_SOURCES 127
|
||||
#define SIFIVE_U_PLIC_NUM_PRIORITIES 7
|
||||
|
|
|
@ -16,14 +16,8 @@
|
|||
* this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#ifndef HW_SPIKE_H
|
||||
#define HW_SPIKE_H
|
||||
|
||||
#define TYPE_RISCV_SPIKE_V1_09_1_BOARD "riscv.spike_v1_9_1"
|
||||
#define TYPE_RISCV_SPIKE_V1_10_0_BOARD "riscv.spike_v1_10"
|
||||
|
||||
#define SPIKE(obj) \
|
||||
OBJECT_CHECK(SpikeState, (obj), TYPE_RISCV_SPIKE_BOARD)
|
||||
#ifndef HW_RISCV_SPIKE_H
|
||||
#define HW_RISCV_SPIKE_H
|
||||
|
||||
typedef struct {
|
||||
/*< private >*/
|
||||
|
@ -35,13 +29,16 @@ typedef struct {
|
|||
int fdt_size;
|
||||
} SpikeState;
|
||||
|
||||
|
||||
enum {
|
||||
SPIKE_MROM,
|
||||
SPIKE_CLINT,
|
||||
SPIKE_DRAM
|
||||
};
|
||||
|
||||
enum {
|
||||
SPIKE_CLOCK_FREQ = 1000000000
|
||||
};
|
||||
|
||||
#if defined(TARGET_RISCV32)
|
||||
#define SPIKE_V1_09_1_CPU TYPE_RISCV_CPU_RV32GCSU_V1_09_1
|
||||
#define SPIKE_V1_10_0_CPU TYPE_RISCV_CPU_RV32GCSU_V1_10_0
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* SiFive VirtIO Board
|
||||
* QEMU RISC-V VirtIO machine interface
|
||||
*
|
||||
* Copyright (c) 2017 SiFive, Inc.
|
||||
*
|
||||
|
@ -16,14 +16,8 @@
|
|||
* this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#ifndef HW_VIRT_H
|
||||
#define HW_VIRT_H
|
||||
|
||||
#define TYPE_RISCV_VIRT_BOARD "riscv.virt"
|
||||
#define VIRT(obj) \
|
||||
OBJECT_CHECK(RISCVVirtState, (obj), TYPE_RISCV_VIRT_BOARD)
|
||||
|
||||
enum { ROM_BASE = 0x1000 };
|
||||
#ifndef HW_RISCV_VIRT_H
|
||||
#define HW_RISCV_VIRT_H
|
||||
|
||||
typedef struct {
|
||||
/*< private >*/
|
||||
|
@ -47,7 +41,6 @@ enum {
|
|||
VIRT_DRAM
|
||||
};
|
||||
|
||||
|
||||
enum {
|
||||
UART0_IRQ = 10,
|
||||
VIRTIO_IRQ = 1, /* 1 to 8 */
|
||||
|
@ -55,6 +48,10 @@ enum {
|
|||
VIRTIO_NDEV = 10
|
||||
};
|
||||
|
||||
enum {
|
||||
VIRT_CLOCK_FREQ = 1000000000
|
||||
};
|
||||
|
||||
#define VIRT_PLIC_HART_CONFIG "MS"
|
||||
#define VIRT_PLIC_NUM_SOURCES 127
|
||||
#define VIRT_PLIC_NUM_PRIORITIES 7
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue