Move condcodes from cranelift-codegen-shared to cranelift-codegen

cranelift/codegen/shared/src/lib.rs

@@ -19,7 +19,6 @@
     )
 )]
 
-pub mod condcodes;
 pub mod constant_hash;
 pub mod constants;
 

cranelift/codegen/src/ir/mod.rs

@@ -2,6 +2,7 @@
 
 mod atomic_rmw_op;
 mod builder;
+pub mod condcodes;
 pub mod constant;
 pub mod dfg;
 pub mod entities;
@@ -57,7 +58,6 @@ pub use crate::ir::table::TableData;
 pub use crate::ir::trapcode::TrapCode;
 pub use crate::ir::types::Type;
 pub use crate::value_label::LabelValueLoc;
-pub use cranelift_codegen_shared::condcodes;
 
 use crate::entity::{entity_impl, PrimaryMap, SecondaryMap};
 

cranelift/codegen/src/isa/x64/lower.rs

@@ -2,8 +2,9 @@
 
 use crate::data_value::DataValue;
 use crate::ir::{
-    condcodes::FloatCC, condcodes::IntCC, types, AbiParam, ArgumentPurpose, ExternalName,
-    Inst as IRInst, InstructionData, LibCall, Opcode, Signature, Type,
+    condcodes::{CondCode, FloatCC, IntCC},
+    types, AbiParam, ArgumentPurpose, ExternalName, Inst as IRInst, InstructionData, LibCall,
+    Opcode, Signature, Type,
 };
 use crate::isa::x64::abi::*;
 use crate::isa::x64::inst::args::*;
@@ -15,7 +16,6 @@ use crate::result::CodegenResult;
 use crate::settings::{Flags, TlsModel};
 use alloc::boxed::Box;
 use alloc::vec::Vec;
-use cranelift_codegen_shared::condcodes::CondCode;
 use log::trace;
 use regalloc::{Reg, RegClass, Writable};
 use smallvec::{smallvec, SmallVec};

cranelift/codegen/src/peepmatic.rs

@@ -2,6 +2,7 @@
 
 use crate::cursor::{Cursor, FuncCursor};
 use crate::ir::{
+    condcodes::IntCC,
     dfg::DataFlowGraph,
     entities::{Inst, Value},
     immediates::{Imm64, Uimm64},
@@ -9,7 +10,6 @@ use crate::ir::{
     types, InstBuilder,
 };
 use crate::isa::TargetIsa;
-use cranelift_codegen_shared::condcodes::IntCC;
 use peepmatic_runtime::{
     cc::ConditionCode,
     instruction_set::InstructionSet,