Skip to content

[MSP430] Fix misc lifting problems #8568

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
emesare merged 3 commits into from
Sep 21, 2026
+18 −18
Merged

[MSP430] Fix misc lifting problems #8568

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a7475d6
[MSP430] Stop emitting new branch target for existing conditional tru…
emesare Sep 21, 2026
f197a54
[MSP430] Fix erroneous byte immediate sign extensions
emesare Sep 21, 2026
7fd6c92
[MSP430] Fix SUB operand ordering
emesare Sep 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 18 additions & 18 deletions arch/msp430/src/lift.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ macro_rules! conditional_jump {
($addr:ident, $inst:ident, $cond:ident, $il:ident) => {
let true_addr = offset_to_absolute($addr, $inst.offset());
let false_addr = $addr + $inst.size() as u64;
let mut new_true = true;
let mut new_true = false;
let mut new_false = false;

let mut true_label = $il.label_for_address(true_addr).unwrap_or_else(|| {
Expand Down Expand Up @@ -173,7 +173,7 @@ pub(crate) fn lift_instruction(inst: &Instruction, addr: u64, il: &LowLevelILMut
let dest = lift_source_operand(inst.source(), size, il);
let op = match inst.operand_width() {
Some(OperandWidth::Byte) => {
il.sx(2, il.rrc(size, dest, src).with_flag_write(FlagWrite::All))
il.zx(2, il.rrc(size, dest, src).with_flag_write(FlagWrite::All))
}
Some(OperandWidth::Word) | None => {
il.rrc(size, dest, src).with_flag_write(FlagWrite::All)
Expand All @@ -195,7 +195,7 @@ pub(crate) fn lift_instruction(inst: &Instruction, addr: u64, il: &LowLevelILMut
let dest = lift_source_operand(inst.source(), size, il);
let op = match inst.operand_width() {
Some(OperandWidth::Byte) => {
il.sx(2, il.ror(size, dest, src).with_flag_write(FlagWrite::Cnz))
il.zx(2, il.ror(size, dest, src).with_flag_write(FlagWrite::Cnz))
}
Some(OperandWidth::Word) | None => {
il.ror(size, dest, src).with_flag_write(FlagWrite::Cnz)
Expand Down Expand Up @@ -291,7 +291,7 @@ pub(crate) fn lift_instruction(inst: &Instruction, addr: u64, il: &LowLevelILMut
let size = width_to_size(inst.operand_width());
let src = match inst.operand_width() {
OperandWidth::Byte => il
.sx(2, lift_source_operand(inst.source(), size, il))
.zx(2, lift_source_operand(inst.source(), size, il))
.build(),
OperandWidth::Word => lift_source_operand(inst.source(), size, il),
};
Expand All @@ -304,7 +304,7 @@ pub(crate) fn lift_instruction(inst: &Instruction, addr: u64, il: &LowLevelILMut
let dest = lift_source_operand(inst.destination(), size, il);
let op = match inst.operand_width() {
OperandWidth::Byte => {
il.sx(2, il.add(size, src, dest).with_flag_write(FlagWrite::All))
il.zx(2, il.add(size, src, dest).with_flag_write(FlagWrite::All))
}
OperandWidth::Word => il.add(size, src, dest).with_flag_write(FlagWrite::All),
};
Expand All @@ -323,9 +323,9 @@ pub(crate) fn lift_instruction(inst: &Instruction, addr: u64, il: &LowLevelILMut
let dest = lift_source_operand(inst.destination(), size, il);
let op = match inst.operand_width() {
OperandWidth::Byte => {
il.sx(2, il.sub(size, src, dest).with_flag_write(FlagWrite::All))
il.zx(2, il.sub(size, dest, src).with_flag_write(FlagWrite::All))
}
OperandWidth::Word => il.sub(size, src, dest).with_flag_write(FlagWrite::All),
OperandWidth::Word => il.sub(size, dest, src).with_flag_write(FlagWrite::All),
};
two_operand!(inst.destination(), il, op);
auto_increment!(inst.source(), il);
Expand Down Expand Up @@ -358,7 +358,7 @@ pub(crate) fn lift_instruction(inst: &Instruction, addr: u64, il: &LowLevelILMut
let src = lift_source_operand(inst.source(), size, il);
let dest = lift_source_operand(inst.destination(), size, il);
let op = match inst.operand_width() {
OperandWidth::Byte => il.sx(2, il.and(size, il.not(size, src), dest)),
OperandWidth::Byte => il.zx(2, il.and(size, il.not(size, src), dest)),
OperandWidth::Word => il.and(size, il.not(size, src), dest),
};
two_operand!(inst.destination(), il, op);
Expand All @@ -369,7 +369,7 @@ pub(crate) fn lift_instruction(inst: &Instruction, addr: u64, il: &LowLevelILMut
let src = lift_source_operand(inst.source(), size, il);
let dest = lift_source_operand(inst.destination(), size, il);
let op = match inst.operand_width() {
OperandWidth::Byte => il.sx(2, il.or(size, src, dest)),
OperandWidth::Byte => il.zx(2, il.or(size, src, dest)),
OperandWidth::Word => il.or(size, src, dest),
};
two_operand!(inst.destination(), il, op);
Expand All @@ -381,7 +381,7 @@ pub(crate) fn lift_instruction(inst: &Instruction, addr: u64, il: &LowLevelILMut
let dest = lift_source_operand(inst.destination(), size, il);
let op = match inst.operand_width() {
OperandWidth::Byte => {
il.sx(2, il.xor(size, src, dest).with_flag_write(FlagWrite::Nvz))
il.zx(2, il.xor(size, src, dest).with_flag_write(FlagWrite::Nvz))
}
OperandWidth::Word => il.xor(size, src, dest).with_flag_write(FlagWrite::Nvz),
};
Expand All @@ -395,7 +395,7 @@ pub(crate) fn lift_instruction(inst: &Instruction, addr: u64, il: &LowLevelILMut
let dest = lift_source_operand(inst.destination(), size, il);
let op = match inst.operand_width() {
OperandWidth::Byte => {
il.sx(2, il.and(size, src, dest).with_flag_write(FlagWrite::Nz))
il.zx(2, il.and(size, src, dest).with_flag_write(FlagWrite::Nz))
}
OperandWidth::Word => il.and(size, src, dest).with_flag_write(FlagWrite::Nz),
};
Expand Down Expand Up @@ -449,7 +449,7 @@ pub(crate) fn lift_instruction(inst: &Instruction, addr: u64, il: &LowLevelILMut
};
let dest = lift_source_operand(&inst.destination().unwrap(), size, il);
let op = match inst.operand_width() {
Some(OperandWidth::Byte) => il.sx(
Some(OperandWidth::Byte) => il.zx(
2,
il.sub(size, dest, il.const_int(size, 1))
.with_flag_write(FlagWrite::All),
Expand All @@ -467,7 +467,7 @@ pub(crate) fn lift_instruction(inst: &Instruction, addr: u64, il: &LowLevelILMut
};
let dest = lift_source_operand(&inst.destination().unwrap(), size, il);
let op = match inst.operand_width() {
Some(OperandWidth::Byte) => il.sx(
Some(OperandWidth::Byte) => il.zx(
2,
il.sub(size, dest, il.const_int(size, 2))
.with_flag_write(FlagWrite::All),
Expand All @@ -491,7 +491,7 @@ pub(crate) fn lift_instruction(inst: &Instruction, addr: u64, il: &LowLevelILMut
};
let dest = lift_source_operand(&inst.destination().unwrap(), size, il);
let op = match inst.operand_width() {
Some(OperandWidth::Byte) => il.sx(
Some(OperandWidth::Byte) => il.zx(
2,
il.add(size, dest, il.const_int(size, 1))
.with_flag_write(FlagWrite::All),
Expand All @@ -509,7 +509,7 @@ pub(crate) fn lift_instruction(inst: &Instruction, addr: u64, il: &LowLevelILMut
};
let dest = lift_source_operand(&inst.destination().unwrap(), size, il);
let op = match inst.operand_width() {
Some(OperandWidth::Byte) => il.sx(
Some(OperandWidth::Byte) => il.zx(
2,
il.add(size, dest, il.const_int(size, 2))
.with_flag_write(FlagWrite::All),
Expand All @@ -528,7 +528,7 @@ pub(crate) fn lift_instruction(inst: &Instruction, addr: u64, il: &LowLevelILMut
let dest = lift_source_operand(&inst.destination().unwrap(), size, il);
let op = match inst.operand_width() {
Some(OperandWidth::Byte) => {
il.sx(2, il.not(size, dest).with_flag_write(FlagWrite::Nvz))
il.zx(2, il.not(size, dest).with_flag_write(FlagWrite::Nvz))
}
Some(OperandWidth::Word) | None => {
il.not(size, dest).with_flag_write(FlagWrite::Nvz)
Expand Down Expand Up @@ -564,7 +564,7 @@ pub(crate) fn lift_instruction(inst: &Instruction, addr: u64, il: &LowLevelILMut
let dest = lift_source_operand(&inst.destination().unwrap(), size, il);
let op = match inst.operand_width() {
Some(OperandWidth::Byte) => {
il.sx(2, il.rol(size, dest, src).with_flag_write(FlagWrite::All))
il.zx(2, il.rol(size, dest, src).with_flag_write(FlagWrite::All))
}
Some(OperandWidth::Word) | None => {
il.rol(size, dest, src).with_flag_write(FlagWrite::All)
Expand All @@ -581,7 +581,7 @@ pub(crate) fn lift_instruction(inst: &Instruction, addr: u64, il: &LowLevelILMut
let dest = lift_source_operand(&inst.destination().unwrap(), size, il);
let op = match inst.operand_width() {
Some(OperandWidth::Byte) => {
il.sx(2, il.rlc(size, dest, src).with_flag_write(FlagWrite::All))
il.zx(2, il.rlc(size, dest, src).with_flag_write(FlagWrite::All))
}
Some(OperandWidth::Word) | None => {
il.rlc(size, dest, src).with_flag_write(FlagWrite::All)
Expand Down
Loading