Commit 61c64cf9 authored by James Hogan's avatar James Hogan Committed by Paolo Bonzini

MIPS: uasm: Add DI instruction

Add DI instruction for disabling interrupts to uasm so that KVM can use
uasm for generating its entry point code at runtime.
Signed-off-by: default avatarJames Hogan <james.hogan@imgtec.com>
Acked-by: default avatarRalf Baechle <ralf@linux-mips.org>
Cc: linux-mips@linux-mips.org
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 59e3559f
...@@ -110,6 +110,7 @@ Ip_u1u2(_ctc1); ...@@ -110,6 +110,7 @@ Ip_u1u2(_ctc1);
Ip_u2u1(_ctcmsa); Ip_u2u1(_ctcmsa);
Ip_u2u1s3(_daddiu); Ip_u2u1s3(_daddiu);
Ip_u3u1u2(_daddu); Ip_u3u1u2(_daddu);
Ip_u1(_di);
Ip_u2u1msbu3(_dins); Ip_u2u1msbu3(_dins);
Ip_u2u1msbu3(_dinsm); Ip_u2u1msbu3(_dinsm);
Ip_u1u2(_divu); Ip_u1u2(_divu);
......
...@@ -376,6 +376,7 @@ enum mm_32axf_minor_op { ...@@ -376,6 +376,7 @@ enum mm_32axf_minor_op {
mm_jalrhb_op = 0x07c, mm_jalrhb_op = 0x07c,
mm_tlbwi_op = 0x08d, mm_tlbwi_op = 0x08d,
mm_tlbwr_op = 0x0cd, mm_tlbwr_op = 0x0cd,
mm_di_op = 0x11d,
mm_jalrs_op = 0x13c, mm_jalrs_op = 0x13c,
mm_jalrshb_op = 0x17c, mm_jalrshb_op = 0x17c,
mm_sync_op = 0x1ad, mm_sync_op = 0x1ad,
......
...@@ -59,6 +59,7 @@ static struct insn insn_table_MM[] = { ...@@ -59,6 +59,7 @@ static struct insn insn_table_MM[] = {
{ insn_ctcmsa, M(mm_pool32s_op, 0, msa_ctc_op, 0, 0, mm_32s_elm_op), RD | RE }, { insn_ctcmsa, M(mm_pool32s_op, 0, msa_ctc_op, 0, 0, mm_32s_elm_op), RD | RE },
{ insn_daddu, 0, 0 }, { insn_daddu, 0, 0 },
{ insn_daddiu, 0, 0 }, { insn_daddiu, 0, 0 },
{ insn_di, M(mm_pool32a_op, 0, 0, 0, mm_di_op, mm_pool32axf_op), RS },
{ insn_divu, M(mm_pool32a_op, 0, 0, 0, mm_divu_op, mm_pool32axf_op), RT | RS }, { insn_divu, M(mm_pool32a_op, 0, 0, 0, mm_divu_op, mm_pool32axf_op), RT | RS },
{ insn_dmfc0, 0, 0 }, { insn_dmfc0, 0, 0 },
{ insn_dmtc0, 0, 0 }, { insn_dmtc0, 0, 0 },
......
...@@ -74,6 +74,7 @@ static struct insn insn_table[] = { ...@@ -74,6 +74,7 @@ static struct insn insn_table[] = {
{ insn_daddiu, M(daddiu_op, 0, 0, 0, 0, 0), RS | RT | SIMM }, { insn_daddiu, M(daddiu_op, 0, 0, 0, 0, 0), RS | RT | SIMM },
{ insn_daddu, M(spec_op, 0, 0, 0, 0, daddu_op), RS | RT | RD }, { insn_daddu, M(spec_op, 0, 0, 0, 0, daddu_op), RS | RT | RD },
{ insn_dinsm, M(spec3_op, 0, 0, 0, 0, dinsm_op), RS | RT | RD | RE }, { insn_dinsm, M(spec3_op, 0, 0, 0, 0, dinsm_op), RS | RT | RD | RE },
{ insn_di, M(cop0_op, mfmc0_op, 0, 12, 0, 0), RT },
{ insn_dins, M(spec3_op, 0, 0, 0, 0, dins_op), RS | RT | RD | RE }, { insn_dins, M(spec3_op, 0, 0, 0, 0, dins_op), RS | RT | RD | RE },
{ insn_divu, M(spec_op, 0, 0, 0, 0, divu_op), RS | RT }, { insn_divu, M(spec_op, 0, 0, 0, 0, divu_op), RS | RT },
{ insn_dmfc0, M(cop0_op, dmfc_op, 0, 0, 0, 0), RT | RD | SET}, { insn_dmfc0, M(cop0_op, dmfc_op, 0, 0, 0, 0), RT | RD | SET},
......
...@@ -50,17 +50,17 @@ enum opcode { ...@@ -50,17 +50,17 @@ enum opcode {
insn_addiu, insn_addu, insn_and, insn_andi, insn_bbit0, insn_bbit1, insn_addiu, insn_addu, insn_and, insn_andi, insn_bbit0, insn_bbit1,
insn_beq, insn_beql, insn_bgez, insn_bgezl, insn_bltz, insn_bltzl, insn_beq, insn_beql, insn_bgez, insn_bgezl, insn_bltz, insn_bltzl,
insn_bne, insn_cache, insn_cfc1, insn_cfcmsa, insn_ctc1, insn_ctcmsa, insn_bne, insn_cache, insn_cfc1, insn_cfcmsa, insn_ctc1, insn_ctcmsa,
insn_daddiu, insn_daddu, insn_dins, insn_dinsm, insn_divu, insn_dmfc0, insn_daddiu, insn_daddu, insn_di, insn_dins, insn_dinsm, insn_divu,
insn_dmtc0, insn_drotr, insn_drotr32, insn_dsll, insn_dsll32, insn_dsra, insn_dmfc0, insn_dmtc0, insn_drotr, insn_drotr32, insn_dsll,
insn_dsrl, insn_dsrl32, insn_dsubu, insn_eret, insn_ext, insn_ins, insn_dsll32, insn_dsra, insn_dsrl, insn_dsrl32, insn_dsubu, insn_eret,
insn_j, insn_jal, insn_jalr, insn_jr, insn_lb, insn_ld, insn_ldx, insn_ext, insn_ins, insn_j, insn_jal, insn_jalr, insn_jr, insn_lb,
insn_lh, insn_ll, insn_lld, insn_lui, insn_lw, insn_lwx, insn_mfc0, insn_ld, insn_ldx, insn_lh, insn_ll, insn_lld, insn_lui, insn_lw,
insn_mfhc0, insn_mfhi, insn_mflo, insn_mtc0, insn_mthc0, insn_mul, insn_lwx, insn_mfc0, insn_mfhc0, insn_mfhi, insn_mflo, insn_mtc0,
insn_or, insn_ori, insn_pref, insn_rfe, insn_rotr, insn_sc, insn_scd, insn_mthc0, insn_mul, insn_or, insn_ori, insn_pref, insn_rfe, insn_rotr,
insn_sd, insn_sll, insn_sllv, insn_slt, insn_sltiu, insn_sltu, insn_sra, insn_sc, insn_scd, insn_sd, insn_sll, insn_sllv, insn_slt, insn_sltiu,
insn_srl, insn_srlv, insn_subu, insn_sw, insn_sync, insn_syscall, insn_sltu, insn_sra, insn_srl, insn_srlv, insn_subu, insn_sw, insn_sync,
insn_tlbp, insn_tlbr, insn_tlbwi, insn_tlbwr, insn_wait, insn_wsbh, insn_syscall, insn_tlbp, insn_tlbr, insn_tlbwi, insn_tlbwr, insn_wait,
insn_xor, insn_xori, insn_yield, insn_lddir, insn_ldpte, insn_wsbh, insn_xor, insn_xori, insn_yield, insn_lddir, insn_ldpte,
}; };
struct insn { struct insn {
...@@ -276,6 +276,7 @@ I_u1u2u3(_dmfc0) ...@@ -276,6 +276,7 @@ I_u1u2u3(_dmfc0)
I_u1u2u3(_dmtc0) I_u1u2u3(_dmtc0)
I_u2u1s3(_daddiu) I_u2u1s3(_daddiu)
I_u3u1u2(_daddu) I_u3u1u2(_daddu)
I_u1(_di);
I_u1u2(_divu) I_u1u2(_divu)
I_u2u1u3(_dsll) I_u2u1u3(_dsll)
I_u2u1u3(_dsll32) I_u2u1u3(_dsll32)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment