diff options
author | Hongtao Jia <hongtao.jia@freescale.com> | 2013-04-28 01:20:07 -0400 |
---|---|---|
committer | Scott Wood <scottwood@freescale.com> | 2013-07-30 16:50:07 -0400 |
commit | 9123c5ed45a583311d8373e99f5e3ee4c0b4306b (patch) | |
tree | daa52aa9e3a0cd915c7c899e8622cb1eb670e734 /arch/powerpc/kvm | |
parent | 3b2f64d00c46e1e4e9bd0bb9bb12619adac27a4b (diff) |
powerpc: Move opcode definitions from kvm/emulate.c to asm/ppc-opcode.h
Opcode and xopcode are useful definitions not just for KVM. Move these
definitions to asm/ppc-opcode.h for public use.
Also add the opcodes for LHAUX and LWZUX.
Signed-off-by: Jia Hongtao <hongtao.jia@freescale.com>
Signed-off-by: Li Yang <leoli@freescale.com>
[scottwood@freesacle.com: update commit message and rebase]
Signed-off-by: Scott Wood <scottwood@freescale.com>
Diffstat (limited to 'arch/powerpc/kvm')
-rw-r--r-- | arch/powerpc/kvm/emulate.c | 45 |
1 files changed, 1 insertions, 44 deletions
diff --git a/arch/powerpc/kvm/emulate.c b/arch/powerpc/kvm/emulate.c index 2c52ada30775..751cd45f65a0 100644 --- a/arch/powerpc/kvm/emulate.c +++ b/arch/powerpc/kvm/emulate.c | |||
@@ -30,53 +30,10 @@ | |||
30 | #include <asm/byteorder.h> | 30 | #include <asm/byteorder.h> |
31 | #include <asm/kvm_ppc.h> | 31 | #include <asm/kvm_ppc.h> |
32 | #include <asm/disassemble.h> | 32 | #include <asm/disassemble.h> |
33 | #include <asm/ppc-opcode.h> | ||
33 | #include "timing.h" | 34 | #include "timing.h" |
34 | #include "trace.h" | 35 | #include "trace.h" |
35 | 36 | ||
36 | #define OP_TRAP 3 | ||
37 | #define OP_TRAP_64 2 | ||
38 | |||
39 | #define OP_31_XOP_TRAP 4 | ||
40 | #define OP_31_XOP_LWZX 23 | ||
41 | #define OP_31_XOP_DCBST 54 | ||
42 | #define OP_31_XOP_TRAP_64 68 | ||
43 | #define OP_31_XOP_DCBF 86 | ||
44 | #define OP_31_XOP_LBZX 87 | ||
45 | #define OP_31_XOP_STWX 151 | ||
46 | #define OP_31_XOP_STBX 215 | ||
47 | #define OP_31_XOP_LBZUX 119 | ||
48 | #define OP_31_XOP_STBUX 247 | ||
49 | #define OP_31_XOP_LHZX 279 | ||
50 | #define OP_31_XOP_LHZUX 311 | ||
51 | #define OP_31_XOP_MFSPR 339 | ||
52 | #define OP_31_XOP_LHAX 343 | ||
53 | #define OP_31_XOP_STHX 407 | ||
54 | #define OP_31_XOP_STHUX 439 | ||
55 | #define OP_31_XOP_MTSPR 467 | ||
56 | #define OP_31_XOP_DCBI 470 | ||
57 | #define OP_31_XOP_LWBRX 534 | ||
58 | #define OP_31_XOP_TLBSYNC 566 | ||
59 | #define OP_31_XOP_STWBRX 662 | ||
60 | #define OP_31_XOP_LHBRX 790 | ||
61 | #define OP_31_XOP_STHBRX 918 | ||
62 | |||
63 | #define OP_LWZ 32 | ||
64 | #define OP_LD 58 | ||
65 | #define OP_LWZU 33 | ||
66 | #define OP_LBZ 34 | ||
67 | #define OP_LBZU 35 | ||
68 | #define OP_STW 36 | ||
69 | #define OP_STWU 37 | ||
70 | #define OP_STD 62 | ||
71 | #define OP_STB 38 | ||
72 | #define OP_STBU 39 | ||
73 | #define OP_LHZ 40 | ||
74 | #define OP_LHZU 41 | ||
75 | #define OP_LHA 42 | ||
76 | #define OP_LHAU 43 | ||
77 | #define OP_STH 44 | ||
78 | #define OP_STHU 45 | ||
79 | |||
80 | void kvmppc_emulate_dec(struct kvm_vcpu *vcpu) | 37 | void kvmppc_emulate_dec(struct kvm_vcpu *vcpu) |
81 | { | 38 | { |
82 | unsigned long dec_nsec; | 39 | unsigned long dec_nsec; |