diff options
author | Markos Chandras <markos.chandras@imgtec.com> | 2014-04-08 07:47:13 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2014-05-30 09:54:39 -0400 |
commit | a8e897ad00d3cfd0ab9029978f0c3f8ecd6fba61 (patch) | |
tree | ddd6a13c011c4330e9897ea354943e27c27330ed /arch/mips/include | |
parent | d6b3314b49e12e8c349deb4ca28e7028db00728f (diff) |
MIPS: uasm: Add mul uasm instruction
It will be used later on by bpf-jit
[ralf@linux-mips.org: Resolved conflict.]
Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
Cc: linux-mips@linux-mips.org
Patchwork: http://patchwork.linux-mips.org/patch/6736/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/include')
-rw-r--r-- | arch/mips/include/asm/uasm.h | 1 | ||||
-rw-r--r-- | arch/mips/include/uapi/asm/inst.h | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/arch/mips/include/asm/uasm.h b/arch/mips/include/asm/uasm.h index a096581168df..95954ba24d31 100644 --- a/arch/mips/include/asm/uasm.h +++ b/arch/mips/include/asm/uasm.h | |||
@@ -134,6 +134,7 @@ Ip_u3u1u2(_lwx); | |||
134 | Ip_u1u2u3(_mfc0); | 134 | Ip_u1u2u3(_mfc0); |
135 | Ip_u1(_mfhi); | 135 | Ip_u1(_mfhi); |
136 | Ip_u1u2u3(_mtc0); | 136 | Ip_u1u2u3(_mtc0); |
137 | Ip_u3u1u2(_mul); | ||
137 | Ip_u3u1u2(_or); | 138 | Ip_u3u1u2(_or); |
138 | Ip_u2u1u3(_ori); | 139 | Ip_u2u1u3(_ori); |
139 | Ip_u2s3u1(_pref); | 140 | Ip_u2s3u1(_pref); |
diff --git a/arch/mips/include/uapi/asm/inst.h b/arch/mips/include/uapi/asm/inst.h index aa37373bfd64..67933839ce6a 100644 --- a/arch/mips/include/uapi/asm/inst.h +++ b/arch/mips/include/uapi/asm/inst.h | |||
@@ -269,6 +269,7 @@ enum mm_32a_minor_op { | |||
269 | mm_addu32_op = 0x150, | 269 | mm_addu32_op = 0x150, |
270 | mm_subu32_op = 0x1d0, | 270 | mm_subu32_op = 0x1d0, |
271 | mm_wsbh_op = 0x1ec, | 271 | mm_wsbh_op = 0x1ec, |
272 | mm_mul_op = 0x210, | ||
272 | mm_and_op = 0x250, | 273 | mm_and_op = 0x250, |
273 | mm_or32_op = 0x290, | 274 | mm_or32_op = 0x290, |
274 | mm_xor32_op = 0x310, | 275 | mm_xor32_op = 0x310, |