T0b1/wasmtime
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix incorrect scaling for SaveXmm128Far.

Browse Source 
The `SaveXmm128Far` unwind op should have a 32-bit unscaled value.

The value was accidentally scaled down by 16 while calculating whether or not
the `SaveXmm128` or `SaveXmm128Far` unwind op should be used.
This commit is contained in:
Peter Huene
2020-07-06 18:52:16 -07:00
parent b391817c0f
commit b1c7c1401e
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cranelift/codegen/src/isa/unwind/winx64.rs
View File

@@ -80,13 +80,13 @@ impl UnwindCode {
stack_offset, stack_offset,
} => { } => {
writer.write_u8(*offset); writer.write_u8(*offset);
let stack_offset = stack_offset / 16; let scaled_stack_offset = stack_offset / 16;
if stack_offset <= core::u16::MAX as u32 { if scaled_stack_offset <= core::u16::MAX as u32 {
writer.write_u8((*reg << 4) | (UnwindOperation::SaveXmm128 as u8)); writer.write_u8((*reg << 4) | (UnwindOperation::SaveXmm128 as u8));
writer.write_u16::<LittleEndian>(stack_offset as u16); writer.write_u16::<LittleEndian>(scaled_stack_offset as u16);
} else { } else {
writer.write_u8((*reg << 4) | (UnwindOperation::SaveXmm128Far as u8)); writer.write_u8((*reg << 4) | (UnwindOperation::SaveXmm128Far as u8));
writer.write_u16::<LittleEndian>(stack_offset as u16); writer.write_u16::<LittleEndian>(*stack_offset as u16);
writer.write_u16::<LittleEndian>((stack_offset >> 16) as u16); writer.write_u16::<LittleEndian>((stack_offset >> 16) as u16);
} }
} }