fluencelabs/wasmer
1
0
Fork 0
mirror of https://github.com/fluencelabs/wasmer synced 2025-06-25 06:31:32 +00:00
Code Issues Projects Releases Wiki Activity

Strongly type scratch registers and fixed an unwinding issue.

Browse Source
This commit is contained in:
losfair
2019-03-05 00:23:49 +08:00
parent 2962fe25b6
commit fa61b66516
2 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/dynasm-backend/src/codegen_x64.rs
View File

@ -1,5 +1,7 @@
use super::codegen::*;
use super::stack::{ControlFrame, ControlStack, IfElseState, ValueInfo, ValueLocation, ValueStack};
use super::stack::{
ControlFrame, ControlStack, IfElseState, ScratchRegister, ValueInfo, ValueLocation, ValueStack,
};
use byteorder::{ByteOrder, LittleEndian};
use dynasmrt::{
x64::Assembler, AssemblyOffset, DynamicLabel, DynasmApi, DynasmLabelApi, ExecutableBuffer,
@ -85,9 +87,9 @@ pub enum Register {
}
impl Register {
pub fn from_scratch_reg(id: u8) -> Register {
pub fn from_scratch_reg(sr: ScratchRegister) -> Register {
use self::Register::*;
match id {
match sr.raw_id() {
0 => RDI,
1 => RSI,
2 => RDX,
@ -804,7 +806,7 @@ impl X64FunctionCode {
let reg = Register::from_scratch_reg(x);
dynasm!(
assembler
; mov Rq(x as u8), rax
; mov Rq(reg as u8), rax
);
}
ValueLocation::Stack => {