Merge pull request #3717 from uweigand/s390x-branchtarget

s390x: Refactor branch and jumptable emission
2022-01-25 08:55:31 -08:00
parent 5fc01bafc7 cee00c6591
commit ce63a113ab
10 changed files with 731 additions and 870 deletions
--- a/cranelift/codegen/src/isa/s390x/lower/isle.rs
+++ b/cranelift/codegen/src/isa/s390x/lower/isle.rs
@@ -5,8 +5,8 @@ pub mod generated_code;

 // Types that the generated ISLE code uses via `use super::*`.
 use super::{
-    BranchTarget, CallIndInfo, CallInfo, Cond, Inst as MInst, JTSequenceInfo, MachLabel, MemArg,
-    MemFlags, Opcode, Reg, UImm16Shifted, UImm32Shifted,
+    CallIndInfo, CallInfo, Cond, Inst as MInst, MachLabel, MemArg, MemFlags, Opcode, Reg,
+    UImm16Shifted, UImm32Shifted,
 };
 use crate::isa::s390x::settings::Flags as IsaFlags;
 use crate::machinst::isle::*;
@@ -27,7 +27,6 @@ use std::vec::Vec;
 type BoxCallInfo = Box<CallInfo>;
 type BoxCallIndInfo = Box<CallIndInfo>;
 type VecMachLabel = Vec<MachLabel>;
-type BoxJTSequenceInfo = Box<JTSequenceInfo>;
 type BoxExternalName = Box<ExternalName>;

 /// The main entry point for lowering with ISLE.
--- a/cranelift/codegen/src/isa/s390x/lower/isle/generated_code.manifest
+++ b/cranelift/codegen/src/isa/s390x/lower/isle/generated_code.manifest
@@ -1,4 +1,4 @@
 src/clif.isle 9ea75a6f790b5c03
 src/prelude.isle 51d2aef2566c1c96
-src/isa/s390x/inst.isle 63cf833b5cfd727d
+src/isa/s390x/inst.isle 17b77476355c4509
 src/isa/s390x/lower.isle a0e21a567040bc33
--- a/cranelift/codegen/src/isa/s390x/lower/isle/generated_code.rs
+++ b/cranelift/codegen/src/isa/s390x/lower/isle/generated_code.rs