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

cranelift: Merge abi and abi_impl modules (#4805)

Browse Source
This commit is contained in:
Nick Fitzgerald
2022-08-29 16:20:36 -07:00
committed by GitHub
parent dd81e5a64f
commit 5392d7cdd7
7 changed files with 1962 additions and 1969 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cranelift/codegen/src/isa/aarch64/abi.rs
View File

@@ -617,7 +617,7 @@ impl ABIMachineSpec for AArch64MachineDeps {
} }
// Returns stack bytes used as well as instructions. Does not adjust // Returns stack bytes used as well as instructions. Does not adjust
// nominal SP offset; abi_impl generic code will do that. // nominal SP offset; abi generic code will do that.
fn gen_clobber_save( fn gen_clobber_save(
_call_conv: isa::CallConv, _call_conv: isa::CallConv,
setup_frame: bool, setup_frame: bool,

4
cranelift/codegen/src/isa/s390x/abi.rs
View File

@@ -1,6 +1,6 @@
//! Implementation of a standard S390x ABI. //! Implementation of a standard S390x ABI.
//! //!
//! This machine uses the "vanilla" ABI implementation from abi_impl.rs, //! This machine uses the "vanilla" ABI implementation from abi.rs,
//! however a few details are different from the description there: //! however a few details are different from the description there:
//! //!
//! - On s390x, the caller must provide a "register save area" of 160 //! - On s390x, the caller must provide a "register save area" of 160
@@ -575,7 +575,7 @@ impl ABIMachineSpec for S390xMachineDeps {
} }
// Returns stack bytes used as well as instructions. Does not adjust // Returns stack bytes used as well as instructions. Does not adjust
// nominal SP offset; abi_impl generic code will do that. // nominal SP offset; abi generic code will do that.
fn gen_clobber_save( fn gen_clobber_save(
_call_conv: isa::CallConv, _call_conv: isa::CallConv,
_setup_frame: bool, _setup_frame: bool,

2
cranelift/codegen/src/isa/s390x/lower/isle.rs
View File

@@ -21,7 +21,7 @@ use crate::{
}, },
isa::unwind::UnwindInst, isa::unwind::UnwindInst,
isa::CallConv, isa::CallConv,
machinst::abi_impl::ABIMachineSpec, machinst::abi::ABIMachineSpec,
machinst::{InsnOutput, Lower, MachInst, VCodeConstant, VCodeConstantData}, machinst::{InsnOutput, Lower, MachInst, VCodeConstant, VCodeConstantData},
}; };
use regalloc2::PReg; use regalloc2::PReg;

2
cranelift/codegen/src/isa/x64/abi.rs
View File

@@ -4,7 +4,7 @@ use crate::ir::{self, types, LibCall, MemFlags, Opcode, Signature, TrapCode, Typ
use crate::ir::{types::*, ExternalName}; use crate::ir::{types::*, ExternalName};
use crate::isa; use crate::isa;
use crate::isa::{unwind::UnwindInst, x64::inst::*, x64::settings as x64_settings, CallConv}; use crate::isa::{unwind::UnwindInst, x64::inst::*, x64::settings as x64_settings, CallConv};
use crate::machinst::abi_impl::*; use crate::machinst::abi::*;
use crate::machinst::*; use crate::machinst::*;
use crate::settings; use crate::settings;
use crate::{CodegenError, CodegenResult}; use crate::{CodegenError, CodegenResult};

1959
cranelift/codegen/src/machinst/abi.rs
View File

File diff suppressed because it is too large Load Diff

1960
cranelift/codegen/src/machinst/abi_impl.rs
View File

File diff suppressed because it is too large Load Diff

2
cranelift/codegen/src/machinst/mod.rs
View File

@@ -73,8 +73,6 @@ pub mod blockorder;
pub use blockorder::*; pub use blockorder::*;
pub mod abi; pub mod abi;
pub use abi::*; pub use abi::*;
pub mod abi_impl;
pub use abi_impl::*;
pub mod buffer; pub mod buffer;
pub use buffer::*; pub use buffer::*;
pub mod helpers; pub mod helpers;