summaryrefslogtreecommitdiffstats
path: root/arch/mips/mm/uasm-micromips.c
diff options
context:
space:
mode:
authorMarkos Chandras <markos.chandras@imgtec.com>2014-04-08 12:47:12 +0100
committerRalf Baechle <ralf@linux-mips.org>2014-05-30 15:54:38 +0200
commitd6b3314b49e12e8c349deb4ca28e7028db00728f (patch)
treeb7238bec333b372269e58db13540cd5dc3d04583 /arch/mips/mm/uasm-micromips.c
parentab9e4fa092db6c4beea8fde67261959520675456 (diff)
downloadop-kernel-dev-d6b3314b49e12e8c349deb4ca28e7028db00728f.zip
op-kernel-dev-d6b3314b49e12e8c349deb4ca28e7028db00728f.tar.gz
MIPS: uasm: Add lh uam 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/6733/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/mm/uasm-micromips.c')
-rw-r--r--arch/mips/mm/uasm-micromips.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/mips/mm/uasm-micromips.c b/arch/mips/mm/uasm-micromips.c
index 071a4c1..99d63d9 100644
--- a/arch/mips/mm/uasm-micromips.c
+++ b/arch/mips/mm/uasm-micromips.c
@@ -82,6 +82,7 @@ static struct insn insn_table_MM[] = {
{ insn_jalr, M(mm_pool32a_op, 0, 0, 0, mm_jalr_op, mm_pool32axf_op), RT | RS },
{ insn_jr, M(mm_pool32a_op, 0, 0, 0, mm_jalr_op, mm_pool32axf_op), RS },
{ insn_ld, 0, 0 },
+ { insn_lh, M(mm_lh32_op, 0, 0, 0, 0, 0), RS | RS | SIMM },
{ insn_ll, M(mm_pool32c_op, 0, 0, (mm_ll_func << 1), 0, 0), RS | RT | SIMM },
{ insn_lld, 0, 0 },
{ insn_lui, M(mm_pool32i_op, mm_lui_op, 0, 0, 0, 0), RS | SIMM },
OpenPOWER on IntegriCloud