diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-01-22 11:16:20 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-01-22 11:16:20 +0000 |
| commit | a805ca54015bd123e2bc2454ec59619d0ed106c2 (patch) | |
| tree | 5bd0c930258f3989f68d180a18a38c2dbf7c5a92 /disas/sparc.c | |
| parent | 699eae17b841e6784dc3864bf357e26bff1e9dfe (diff) | |
| parent | 7230818a2b54df826e5ecdd83bd20632c9a8b07c (diff) | |
| download | focaccia-qemu-a805ca54015bd123e2bc2454ec59619d0ed106c2.tar.gz focaccia-qemu-a805ca54015bd123e2bc2454ec59619d0ed106c2.zip | |
Merge remote-tracking branch 'remotes/mcayland/tags/qemu-sparc-signed' into staging
qemu-sparc update # gpg: Signature made Wed 21 Jan 2015 16:56:31 GMT using RSA key ID AE0F321F # gpg: Good signature from "Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>" * remotes/mcayland/tags/qemu-sparc-signed: disas/sparc: Remove unused data sparc_opcode_archs[] target-sparc: Mark gen_load_trap_state_at_tl() as !CONFIG_USER_ONLY target-sparc: is_translating_asi() is TARGET_SPARC64 only target-sparc: address_mask(), asi_address_mask() are TARGET_SPARC64 only target-sparc: Remove unused gen_op_subi_cc and gen_op_addi_cc Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'disas/sparc.c')
| -rw-r--r-- | disas/sparc.c | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/disas/sparc.c b/disas/sparc.c index 8e755d1ba2..f4e356573e 100644 --- a/disas/sparc.c +++ b/disas/sparc.c @@ -80,19 +80,6 @@ typedef struct sparc_opcode_arch short supported; } sparc_opcode_arch; -static const struct sparc_opcode_arch sparc_opcode_archs[]; - -/* Return the bitmask of supported architectures for ARCH. */ -#define SPARC_OPCODE_SUPPORTED(ARCH) (sparc_opcode_archs[ARCH].supported) - -/* Non-zero if ARCH1 conflicts with ARCH2. - IE: ARCH1 as a supported bit set that ARCH2 doesn't, and vice versa. */ -#define SPARC_OPCODE_CONFLICT_P(ARCH1, ARCH2) \ - (((SPARC_OPCODE_SUPPORTED (ARCH1) & SPARC_OPCODE_SUPPORTED (ARCH2)) \ - != SPARC_OPCODE_SUPPORTED (ARCH1)) \ - && ((SPARC_OPCODE_SUPPORTED (ARCH1) & SPARC_OPCODE_SUPPORTED (ARCH2)) \ - != SPARC_OPCODE_SUPPORTED (ARCH2))) - /* Structure of an opcode table entry. */ typedef struct sparc_opcode @@ -301,25 +288,6 @@ static const char *sparc_decode_sparclet_cpreg (int); otherwise. */ #define v9notv9a (MASK_V9) -/* Table of opcode architectures. - The order is defined in opcode/sparc.h. */ - -static const struct sparc_opcode_arch sparc_opcode_archs[] = -{ - { "v6", MASK_V6 }, - { "v7", MASK_V6 | MASK_V7 }, - { "v8", MASK_V6 | MASK_V7 | MASK_V8 }, - { "sparclet", MASK_V6 | MASK_V7 | MASK_V8 | MASK_SPARCLET }, - { "sparclite", MASK_V6 | MASK_V7 | MASK_V8 | MASK_SPARCLITE }, - /* ??? Don't some v8 privileged insns conflict with v9? */ - { "v9", MASK_V6 | MASK_V7 | MASK_V8 | MASK_V9 }, - /* v9 with ultrasparc additions */ - { "v9a", MASK_V6 | MASK_V7 | MASK_V8 | MASK_V9 | MASK_V9A }, - /* v9 with cheetah additions */ - { "v9b", MASK_V6 | MASK_V7 | MASK_V8 | MASK_V9 | MASK_V9A | MASK_V9B }, - { NULL, 0 } -}; - /* Branch condition field. */ #define COND(x) (((x) & 0xf) << 25) |