diff for duplicates of <ZAgsiPlL9O7KnlZZ@cleo> diff --git a/a/1.txt b/N1/1.txt index fa3c000..8aac759 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -66,11 +66,11 @@ index 7006bcbc2e37..0be313e71615 100644 + unsigned int suffix; mask = 0x10000000; -- if ((instr & 0xfc000000) = 0x7c000000) +- if ((instr & 0xfc000000) == 0x7c000000) + suffix = ppc_inst_val(instr); + if (ppc_inst_prefixed(instr)) + suffix = ppc_inst_suffix(instr); -+ else if ((suffix & 0xfc000000) = 0x7c000000) ++ else if ((suffix & 0xfc000000) == 0x7c000000) mask = 0x100; /* major opcode 31 */ - return (instr & mask) != 0; + return (suffix & mask) != 0; @@ -95,13 +95,14 @@ index 6ba68dd6190b..7d1aede06153 100644 - u32 last_inst; + ppc_inst_t last_inst; - if (kvmppc_get_last_inst(vcpu, INST_GENERIC, &last_inst) ! EMULATE_DONE) { + if (kvmppc_get_last_inst(vcpu, INST_GENERIC, &last_inst) != + EMULATE_DONE) { @@ -1423,7 +1423,7 @@ static int kvmppc_emulate_debug_inst(struct kvm_vcpu *vcpu) return RESUME_GUEST; } -- if (last_inst = KVMPPC_INST_SW_BREAKPOINT) { -+ if (ppc_inst_val(last_inst) = KVMPPC_INST_SW_BREAKPOINT) { +- if (last_inst == KVMPPC_INST_SW_BREAKPOINT) { ++ if (ppc_inst_val(last_inst) == KVMPPC_INST_SW_BREAKPOINT) { vcpu->run->exit_reason = KVM_EXIT_DEBUG; vcpu->run->debug.arch.address = kvmppc_get_pc(vcpu); return RESUME_HOST; @@ -205,8 +206,8 @@ index 9fc4dd8f66eb..940ab010a471 100644 } if (vcpu->arch.papr_enabled && -- (last_sc = 0x44000022) && -+ (ppc_inst_val(last_sc) = 0x44000022) && +- (last_sc == 0x44000022) && ++ (ppc_inst_val(last_sc) == 0x44000022) && !(kvmppc_get_msr(vcpu) & MSR_PR)) { /* SC 1 papr hypercalls */ ulong cmd = kvmppc_get_gpr(vcpu, 3); @@ -227,7 +228,7 @@ index 9fc4dd8f66eb..940ab010a471 100644 + ppc_inst_t last_inst; int emul = kvmppc_get_last_inst(vcpu, INST_GENERIC, &last_inst); - if (emul = EMULATE_DONE) { + if (emul == EMULATE_DONE) { u32 dsisr; u64 dar; @@ -308,8 +309,8 @@ index cfc9114b87d0..3eb2803b86fe 100644 emulated = EMULATE_FAIL; vcpu->arch.regs.msr = vcpu->arch.shared->msr; -- if (analyse_instr(&op, &vcpu->arch.regs, ppc_inst(inst)) = 0) { -+ if (analyse_instr(&op, &vcpu->arch.regs, inst) = 0) { +- if (analyse_instr(&op, &vcpu->arch.regs, ppc_inst(inst)) == 0) { ++ if (analyse_instr(&op, &vcpu->arch.regs, inst) == 0) { int type = op.type & INSTR_TYPE_MASK; int size = GETSIZE(op.type); diff --git a/a/content_digest b/N1/content_digest index 299748d..1980cc1 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,12 +1,12 @@ "ref\0ZAgsR04beDcARCiw@cleo\0" "From\0Paul Mackerras <paulus@ozlabs.org>\0" "Subject\0[PATCH 1/3] powerpc/kvm: Make kvmppc_get_last_inst() produce a ppc_inst_t\0" - "Date\0Wed, 08 Mar 2023 06:34:48 +0000\0" + "Date\0Wed, 8 Mar 2023 17:34:48 +1100\0" "To\0linuxppc-dev@ozlabs.org" " kvm@vger.kernel.org\0" "Cc\0Michael Neuling <mikey@neuling.org>" - Nick Piggin <npiggin@gmail.com> - " kvm-ppc@vger.kernel.org\0" + kvm-ppc@vger.kernel.org + " Nick Piggin <npiggin@gmail.com>\0" "\00:1\0" "b\0" "This changes kvmppc_get_last_inst() so that the instruction it fetches\n" @@ -77,11 +77,11 @@ "+\tunsigned int suffix;\n" " \n" " \tmask = 0x10000000;\n" - "-\tif ((instr & 0xfc000000) = 0x7c000000)\n" + "-\tif ((instr & 0xfc000000) == 0x7c000000)\n" "+\tsuffix = ppc_inst_val(instr);\n" "+\tif (ppc_inst_prefixed(instr))\n" "+\t\tsuffix = ppc_inst_suffix(instr);\n" - "+\telse if ((suffix & 0xfc000000) = 0x7c000000)\n" + "+\telse if ((suffix & 0xfc000000) == 0x7c000000)\n" " \t\tmask = 0x100;\t\t/* major opcode 31 */\n" "-\treturn (instr & mask) != 0;\n" "+\treturn (suffix & mask) != 0;\n" @@ -106,13 +106,14 @@ "-\tu32 last_inst;\n" "+\tppc_inst_t last_inst;\n" " \n" - " \tif (kvmppc_get_last_inst(vcpu, INST_GENERIC, &last_inst) ! \t\t\t\t\tEMULATE_DONE) {\n" + " \tif (kvmppc_get_last_inst(vcpu, INST_GENERIC, &last_inst) !=\n" + " \t\t\t\t\tEMULATE_DONE) {\n" "@@ -1423,7 +1423,7 @@ static int kvmppc_emulate_debug_inst(struct kvm_vcpu *vcpu)\n" " \t\treturn RESUME_GUEST;\n" " \t}\n" " \n" - "-\tif (last_inst = KVMPPC_INST_SW_BREAKPOINT) {\n" - "+\tif (ppc_inst_val(last_inst) = KVMPPC_INST_SW_BREAKPOINT) {\n" + "-\tif (last_inst == KVMPPC_INST_SW_BREAKPOINT) {\n" + "+\tif (ppc_inst_val(last_inst) == KVMPPC_INST_SW_BREAKPOINT) {\n" " \t\tvcpu->run->exit_reason = KVM_EXIT_DEBUG;\n" " \t\tvcpu->run->debug.arch.address = kvmppc_get_pc(vcpu);\n" " \t\treturn RESUME_HOST;\n" @@ -216,8 +217,8 @@ " \t\t}\n" " \n" " \t\tif (vcpu->arch.papr_enabled &&\n" - "-\t\t (last_sc = 0x44000022) &&\n" - "+\t\t (ppc_inst_val(last_sc) = 0x44000022) &&\n" + "-\t\t (last_sc == 0x44000022) &&\n" + "+\t\t (ppc_inst_val(last_sc) == 0x44000022) &&\n" " \t\t !(kvmppc_get_msr(vcpu) & MSR_PR)) {\n" " \t\t\t/* SC 1 papr hypercalls */\n" " \t\t\tulong cmd = kvmppc_get_gpr(vcpu, 3);\n" @@ -238,7 +239,7 @@ "+\t\tppc_inst_t last_inst;\n" " \t\tint emul = kvmppc_get_last_inst(vcpu, INST_GENERIC, &last_inst);\n" " \n" - " \t\tif (emul = EMULATE_DONE) {\n" + " \t\tif (emul == EMULATE_DONE) {\n" " \t\t\tu32 dsisr;\n" " \t\t\tu64 dar;\n" " \n" @@ -319,8 +320,8 @@ " \n" " \temulated = EMULATE_FAIL;\n" " \tvcpu->arch.regs.msr = vcpu->arch.shared->msr;\n" - "-\tif (analyse_instr(&op, &vcpu->arch.regs, ppc_inst(inst)) = 0) {\n" - "+\tif (analyse_instr(&op, &vcpu->arch.regs, inst) = 0) {\n" + "-\tif (analyse_instr(&op, &vcpu->arch.regs, ppc_inst(inst)) == 0) {\n" + "+\tif (analyse_instr(&op, &vcpu->arch.regs, inst) == 0) {\n" " \t\tint type = op.type & INSTR_TYPE_MASK;\n" " \t\tint size = GETSIZE(op.type);\n" " \n" @@ -354,4 +355,4 @@ "-- \n" 2.37.3 -22b67bb45318428df85bc843251bf2134fc1ab77007d5f99883b3d37681d6934 +0c1252eaab8cc7030ce15e1839a97e3363ee351e49212a9d3882e11504e7746f
diff --git a/a/1.txt b/N2/1.txt index fa3c000..8aac759 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -66,11 +66,11 @@ index 7006bcbc2e37..0be313e71615 100644 + unsigned int suffix; mask = 0x10000000; -- if ((instr & 0xfc000000) = 0x7c000000) +- if ((instr & 0xfc000000) == 0x7c000000) + suffix = ppc_inst_val(instr); + if (ppc_inst_prefixed(instr)) + suffix = ppc_inst_suffix(instr); -+ else if ((suffix & 0xfc000000) = 0x7c000000) ++ else if ((suffix & 0xfc000000) == 0x7c000000) mask = 0x100; /* major opcode 31 */ - return (instr & mask) != 0; + return (suffix & mask) != 0; @@ -95,13 +95,14 @@ index 6ba68dd6190b..7d1aede06153 100644 - u32 last_inst; + ppc_inst_t last_inst; - if (kvmppc_get_last_inst(vcpu, INST_GENERIC, &last_inst) ! EMULATE_DONE) { + if (kvmppc_get_last_inst(vcpu, INST_GENERIC, &last_inst) != + EMULATE_DONE) { @@ -1423,7 +1423,7 @@ static int kvmppc_emulate_debug_inst(struct kvm_vcpu *vcpu) return RESUME_GUEST; } -- if (last_inst = KVMPPC_INST_SW_BREAKPOINT) { -+ if (ppc_inst_val(last_inst) = KVMPPC_INST_SW_BREAKPOINT) { +- if (last_inst == KVMPPC_INST_SW_BREAKPOINT) { ++ if (ppc_inst_val(last_inst) == KVMPPC_INST_SW_BREAKPOINT) { vcpu->run->exit_reason = KVM_EXIT_DEBUG; vcpu->run->debug.arch.address = kvmppc_get_pc(vcpu); return RESUME_HOST; @@ -205,8 +206,8 @@ index 9fc4dd8f66eb..940ab010a471 100644 } if (vcpu->arch.papr_enabled && -- (last_sc = 0x44000022) && -+ (ppc_inst_val(last_sc) = 0x44000022) && +- (last_sc == 0x44000022) && ++ (ppc_inst_val(last_sc) == 0x44000022) && !(kvmppc_get_msr(vcpu) & MSR_PR)) { /* SC 1 papr hypercalls */ ulong cmd = kvmppc_get_gpr(vcpu, 3); @@ -227,7 +228,7 @@ index 9fc4dd8f66eb..940ab010a471 100644 + ppc_inst_t last_inst; int emul = kvmppc_get_last_inst(vcpu, INST_GENERIC, &last_inst); - if (emul = EMULATE_DONE) { + if (emul == EMULATE_DONE) { u32 dsisr; u64 dar; @@ -308,8 +309,8 @@ index cfc9114b87d0..3eb2803b86fe 100644 emulated = EMULATE_FAIL; vcpu->arch.regs.msr = vcpu->arch.shared->msr; -- if (analyse_instr(&op, &vcpu->arch.regs, ppc_inst(inst)) = 0) { -+ if (analyse_instr(&op, &vcpu->arch.regs, inst) = 0) { +- if (analyse_instr(&op, &vcpu->arch.regs, ppc_inst(inst)) == 0) { ++ if (analyse_instr(&op, &vcpu->arch.regs, inst) == 0) { int type = op.type & INSTR_TYPE_MASK; int size = GETSIZE(op.type); diff --git a/a/content_digest b/N2/content_digest index 299748d..c6451e4 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,7 +1,7 @@ "ref\0ZAgsR04beDcARCiw@cleo\0" "From\0Paul Mackerras <paulus@ozlabs.org>\0" "Subject\0[PATCH 1/3] powerpc/kvm: Make kvmppc_get_last_inst() produce a ppc_inst_t\0" - "Date\0Wed, 08 Mar 2023 06:34:48 +0000\0" + "Date\0Wed, 8 Mar 2023 17:34:48 +1100\0" "To\0linuxppc-dev@ozlabs.org" " kvm@vger.kernel.org\0" "Cc\0Michael Neuling <mikey@neuling.org>" @@ -77,11 +77,11 @@ "+\tunsigned int suffix;\n" " \n" " \tmask = 0x10000000;\n" - "-\tif ((instr & 0xfc000000) = 0x7c000000)\n" + "-\tif ((instr & 0xfc000000) == 0x7c000000)\n" "+\tsuffix = ppc_inst_val(instr);\n" "+\tif (ppc_inst_prefixed(instr))\n" "+\t\tsuffix = ppc_inst_suffix(instr);\n" - "+\telse if ((suffix & 0xfc000000) = 0x7c000000)\n" + "+\telse if ((suffix & 0xfc000000) == 0x7c000000)\n" " \t\tmask = 0x100;\t\t/* major opcode 31 */\n" "-\treturn (instr & mask) != 0;\n" "+\treturn (suffix & mask) != 0;\n" @@ -106,13 +106,14 @@ "-\tu32 last_inst;\n" "+\tppc_inst_t last_inst;\n" " \n" - " \tif (kvmppc_get_last_inst(vcpu, INST_GENERIC, &last_inst) ! \t\t\t\t\tEMULATE_DONE) {\n" + " \tif (kvmppc_get_last_inst(vcpu, INST_GENERIC, &last_inst) !=\n" + " \t\t\t\t\tEMULATE_DONE) {\n" "@@ -1423,7 +1423,7 @@ static int kvmppc_emulate_debug_inst(struct kvm_vcpu *vcpu)\n" " \t\treturn RESUME_GUEST;\n" " \t}\n" " \n" - "-\tif (last_inst = KVMPPC_INST_SW_BREAKPOINT) {\n" - "+\tif (ppc_inst_val(last_inst) = KVMPPC_INST_SW_BREAKPOINT) {\n" + "-\tif (last_inst == KVMPPC_INST_SW_BREAKPOINT) {\n" + "+\tif (ppc_inst_val(last_inst) == KVMPPC_INST_SW_BREAKPOINT) {\n" " \t\tvcpu->run->exit_reason = KVM_EXIT_DEBUG;\n" " \t\tvcpu->run->debug.arch.address = kvmppc_get_pc(vcpu);\n" " \t\treturn RESUME_HOST;\n" @@ -216,8 +217,8 @@ " \t\t}\n" " \n" " \t\tif (vcpu->arch.papr_enabled &&\n" - "-\t\t (last_sc = 0x44000022) &&\n" - "+\t\t (ppc_inst_val(last_sc) = 0x44000022) &&\n" + "-\t\t (last_sc == 0x44000022) &&\n" + "+\t\t (ppc_inst_val(last_sc) == 0x44000022) &&\n" " \t\t !(kvmppc_get_msr(vcpu) & MSR_PR)) {\n" " \t\t\t/* SC 1 papr hypercalls */\n" " \t\t\tulong cmd = kvmppc_get_gpr(vcpu, 3);\n" @@ -238,7 +239,7 @@ "+\t\tppc_inst_t last_inst;\n" " \t\tint emul = kvmppc_get_last_inst(vcpu, INST_GENERIC, &last_inst);\n" " \n" - " \t\tif (emul = EMULATE_DONE) {\n" + " \t\tif (emul == EMULATE_DONE) {\n" " \t\t\tu32 dsisr;\n" " \t\t\tu64 dar;\n" " \n" @@ -319,8 +320,8 @@ " \n" " \temulated = EMULATE_FAIL;\n" " \tvcpu->arch.regs.msr = vcpu->arch.shared->msr;\n" - "-\tif (analyse_instr(&op, &vcpu->arch.regs, ppc_inst(inst)) = 0) {\n" - "+\tif (analyse_instr(&op, &vcpu->arch.regs, inst) = 0) {\n" + "-\tif (analyse_instr(&op, &vcpu->arch.regs, ppc_inst(inst)) == 0) {\n" + "+\tif (analyse_instr(&op, &vcpu->arch.regs, inst) == 0) {\n" " \t\tint type = op.type & INSTR_TYPE_MASK;\n" " \t\tint size = GETSIZE(op.type);\n" " \n" @@ -354,4 +355,4 @@ "-- \n" 2.37.3 -22b67bb45318428df85bc843251bf2134fc1ab77007d5f99883b3d37681d6934 +e02699458cfee1f2f28737ef75b8b3758de71255b971242650498b80497e53bd
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.