[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 6/8] target-arm/helper.c: Allow const opaques in arm
From: |
Peter Maydell |
Subject: |
[Qemu-devel] [PULL 6/8] target-arm/helper.c: Allow const opaques in arm CP |
Date: |
Mon, 15 Jul 2013 17:17:00 +0100 |
From: Peter Crosthwaite <address@hidden>
Allow for defining const opaque data in ARM CP register definitions by
setting .opaque = foo. If non null opaque is passed into
define_one_arm_cp_reg_with_opaque then that opaque will take
precedence, otherwise if null opaque is passed, the original opaque
data will be used.
Signed-off-by: Peter Crosthwaite <address@hidden>
Message-id: address@hidden
Signed-off-by: Peter Maydell <address@hidden>
---
target-arm/helper.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/target-arm/helper.c b/target-arm/helper.c
index 8d8a8de..b7c926d 100644
--- a/target-arm/helper.c
+++ b/target-arm/helper.c
@@ -1608,7 +1608,9 @@ void define_one_arm_cp_reg_with_opaque(ARMCPU *cpu,
ARMCPRegInfo *r2 = g_memdup(r, sizeof(ARMCPRegInfo));
int is64 = (r->type & ARM_CP_64BIT) ? 1 : 0;
*key = ENCODE_CP_REG(r->cp, is64, r->crn, crm, opc1, opc2);
- r2->opaque = opaque;
+ if (opaque) {
+ r2->opaque = opaque;
+ }
/* Make sure reginfo passed to helpers for wildcarded regs
* has the correct crm/opc1/opc2 for this reg, not CP_ANY:
*/
--
1.7.9.5
- [Qemu-devel] [PULL 0/8] target-arm queue, Peter Maydell, 2013/07/15
- [Qemu-devel] [PULL 2/8] target-arm: implement LDA/STL instructions, Peter Maydell, 2013/07/15
- [Qemu-devel] [PULL 7/8] target-arm: avoid undefined behaviour when writing TTBCR, Peter Maydell, 2013/07/15
- [Qemu-devel] [PULL 6/8] target-arm/helper.c: Allow const opaques in arm CP,
Peter Maydell <=
- [Qemu-devel] [PULL 8/8] target-arm: Avoid g_hash_table_get_keys(), Peter Maydell, 2013/07/15
- [Qemu-devel] [PULL 4/8] target-arm/helper.c: OMAP/StrongARM cp15 crn=0 cleanup, Peter Maydell, 2013/07/15
- [Qemu-devel] [PULL 1/8] target-arm: add feature flag for ARMv8, Peter Maydell, 2013/07/15
- [Qemu-devel] [PULL 5/8] target-arm/helper.c: Implement MIDR aliases, Peter Maydell, 2013/07/15
- [Qemu-devel] [PULL 3/8] target-arm: explicitly decode SEVL instruction, Peter Maydell, 2013/07/15