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:08 +0100
committerRalf Baechle <ralf@linux-mips.org>2014-05-30 15:54:38 +0200
commit7fa22681c4d6e12cc6aed91056d3e09d47572e6d (patch)
treec59a5344e216af4ec240d737abf96fba22c5b7e4 /arch/mips/mm/uasm-micromips.c
parentf3ec7a23b640a064410e31afe9a203f7c125460e (diff)
downloadlinux-stable-7fa22681c4d6e12cc6aed91056d3e09d47572e6d.tar.gz
linux-stable-7fa22681c4d6e12cc6aed91056d3e09d47572e6d.tar.bz2
linux-stable-7fa22681c4d6e12cc6aed91056d3e09d47572e6d.zip
MIPS: uasm: Add jalr 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/6729/ 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 c04c9c95c3c7..6128cf3c8f1c 100644
--- a/arch/mips/mm/uasm-micromips.c
+++ b/arch/mips/mm/uasm-micromips.c
@@ -79,6 +79,7 @@ static struct insn insn_table_MM[] = {
{ insn_ext, M(mm_pool32a_op, 0, 0, 0, 0, mm_ext_op), RT | RS | RD | RE },
{ insn_j, M(mm_j32_op, 0, 0, 0, 0, 0), JIMM },
{ insn_jal, M(mm_jal32_op, 0, 0, 0, 0, 0), JIMM },
+ { 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_ll, M(mm_pool32c_op, 0, 0, (mm_ll_func << 1), 0, 0), RS | RT | SIMM },