Move IR modules under repr/.

Use the cretonne::repr module as a common namespace for sub-modules defining the
in-memory representation of Cretonn IL.

src/libcretonne/cfg.rs

@@ -21,8 +21,8 @@
 //! and (Ebb0, `jmp Ebb2`) respectively.
 
 use repr::Function;
-use entities::{Inst, Ebb};
+use repr::entities::{Inst, Ebb};
-use instructions::InstructionData;
+use repr::instructions::InstructionData;
 use std::collections::{BTreeSet, BTreeMap, btree_map};
 
 /// A basic block denoted by its enclosing Ebb and last instruction.

src/libcretonne/lib.rs

@@ -7,14 +7,7 @@
 
 pub const VERSION: &'static str = env!("CARGO_PKG_VERSION");
 
-pub mod types;
-pub mod condcodes;
-pub mod immediates;
-pub mod entities;
-pub mod instructions;
 pub mod repr;
-pub mod dfg;
-pub mod layout;
 pub mod write;
 pub mod cfg;
 

src/libcretonne/repr/dfg.rs

@@ -1,9 +1,9 @@
 //! Data flow graph tracking Instructions, Values, and EBBs.
 
 use entity_map::EntityMap;
-use entities::{Ebb, Inst, Value, NO_VALUE, ExpandedValue};
+use repr::entities::{Ebb, Inst, Value, NO_VALUE, ExpandedValue};
-use instructions::InstructionData;
+use repr::instructions::InstructionData;
-use types::Type;
+use repr::types::Type;
 use std::ops::{Index, IndexMut};
 use std::u16;
 
@@ -57,7 +57,7 @@ impl DataFlowGraph {
 
     /// Get the type of a value.
     pub fn value_type(&self, v: Value) -> Type {
-        use entities::ExpandedValue::*;
+        use repr::entities::ExpandedValue::*;
         match v.expand() {
             Direct(i) => self.insts[i].first_type(),
             Table(i) => {
@@ -75,7 +75,7 @@ impl DataFlowGraph {
     /// This is either the instruction that defined it or the Ebb that has the value as an
     /// argument.
     pub fn value_def(&self, v: Value) -> ValueDef {
-        use entities::ExpandedValue::*;
+        use repr::entities::ExpandedValue::*;
         match v.expand() {
             Direct(inst) => ValueDef::Res(inst, 0),
             Table(idx) => {
@@ -339,8 +339,8 @@ impl EbbData {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use types;
+    use repr::types;
-    use instructions::{Opcode, InstructionData};
+    use repr::instructions::{Opcode, InstructionData};
 
     #[test]
     fn make_inst() {

src/libcretonne/repr/instructions.rs

@@ -10,10 +10,10 @@ use std::fmt::{self, Display, Formatter};
 use std::str::FromStr;
 use std::ops::{Deref, DerefMut};
 
-use entities::*;
+use repr::entities::*;
-use immediates::*;
+use repr::immediates::*;
-use condcodes::*;
+use repr::condcodes::*;
-use types::{self, Type};
+use repr::types::{self, Type};
 
 // Include code generated by `meta/gen_instr.py`. This file contains:
 //
@@ -560,7 +560,7 @@ mod tests {
 
     #[test]
     fn value_set() {
-        use types::*;
+        use repr::types::*;
 
         let vts = ValueTypeSet {
             allow_scalars: true,

src/libcretonne/repr/layout.rs

@@ -5,7 +5,7 @@
 
 use std::iter::{Iterator, IntoIterator};
 use entity_map::{EntityMap, EntityRef};
-use entities::{Ebb, NO_EBB, Inst, NO_INST};
+use repr::entities::{Ebb, NO_EBB, Inst, NO_INST};
 
 /// The `Layout` struct determines the layout of EBBs and instructions in a function. It does not
 /// contain definitions of instructions or EBBs, but depends on `Inst` and `Ebb` entity references
@@ -242,7 +242,7 @@ impl<'a> Iterator for Insts<'a> {
 mod tests {
     use super::Layout;
     use entity_map::EntityRef;
-    use entities::{Ebb, Inst};
+    use repr::entities::{Ebb, Inst};
 
     #[test]
     fn append_ebb() {

src/libcretonne/repr/mod.rs

@@ -1,10 +1,18 @@
 //! Representation of Cretonne IL functions.
 
-use types::{FunctionName, Signature};
+pub mod entities;
+pub mod types;
+pub mod condcodes;
+pub mod immediates;
+pub mod instructions;
+pub mod dfg;
+pub mod layout;
+
+use repr::types::{FunctionName, Signature};
 use entity_map::EntityRef;
-use entities::{Ebb, NO_EBB, StackSlot};
+use repr::entities::{Ebb, NO_EBB, StackSlot};
-use dfg::DataFlowGraph;
+use repr::dfg::DataFlowGraph;
-use layout::Layout;
+use repr::layout::Layout;
 use std::fmt::{self, Debug, Display, Formatter};
 use std::ops::Index;
 

src/libcretonne/test_utils/make_inst.rs

@@ -1,9 +1,9 @@
 //! Helper functions for generating dummy instructions.
 
 use repr::Function;
-use entities::{Ebb, Inst, NO_VALUE};
+use repr::entities::{Ebb, Inst, NO_VALUE};
-use instructions::{InstructionData, Opcode, VariableArgs, JumpData, BranchData};
+use repr::instructions::{InstructionData, Opcode, VariableArgs, JumpData, BranchData};
-use types;
+use repr::types;
 
 pub fn jump(func: &mut Function, dest: Ebb) -> Inst {
     func.dfg.make_inst(InstructionData::Jump {

src/libcretonne/write.rs

@@ -6,8 +6,8 @@
 
 use std::io::{self, Write};
 use repr::Function;
-use entities::{Inst, Ebb, Value};
+use repr::entities::{Inst, Ebb, Value};
-use types::Type;
+use repr::types::Type;
 
 pub type Result = io::Result<()>;
 
@@ -182,7 +182,7 @@ pub fn write_instruction(w: &mut Write, func: &Function, inst: Inst) -> Result {
     }
 
     // Then the operands, depending on format.
-    use instructions::InstructionData::*;
+    use repr::instructions::InstructionData::*;
     match func.dfg[inst] {
         Nullary { .. } => writeln!(w, ""),
         Unary { arg, .. } => writeln!(w, " {}", arg),
@@ -218,7 +218,7 @@ mod tests {
     use super::*;
     use super::{needs_quotes, escaped};
     use repr::{Function, StackSlotData};
-    use types;
+    use repr::types;
 
     #[test]
     fn quoting() {

src/libreader/lexer.rs

@@ -6,8 +6,8 @@
 // ====--------------------------------------------------------------------------------------====//
 
 use std::str::CharIndices;
-use cretonne::types;
+use cretonne::repr::types;
-use cretonne::entities::{Value, Ebb};
+use cretonne::repr::entities::{Value, Ebb};
 
 /// The location of a `Token` or `Error`.
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
@@ -373,8 +373,8 @@ impl<'a> Lexer<'a> {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use cretonne::types;
+    use cretonne::repr::types;
-    use cretonne::entities::{Value, Ebb};
+    use cretonne::repr::entities::{Value, Ebb};
 
     fn token<'a>(token: Token<'a>, line: usize) -> Option<Result<LocatedToken<'a>, LocatedError>> {
         Some(super::token(token, Location { line_number: line }))

src/libreader/parser.rs

@@ -11,11 +11,11 @@ use std::fmt::{self, Display, Formatter};
 use std::str::FromStr;
 use std::u32;
 use lexer::{self, Lexer, Token};
-use cretonne::types::{Type, VOID, FunctionName, Signature, ArgumentType, ArgumentExtension};
+use cretonne::repr::types::{Type, VOID, FunctionName, Signature, ArgumentType, ArgumentExtension};
-use cretonne::immediates::{Imm64, Ieee32, Ieee64};
+use cretonne::repr::immediates::{Imm64, Ieee32, Ieee64};
-use cretonne::entities::*;
+use cretonne::repr::entities::*;
-use cretonne::instructions::{Opcode, InstructionFormat, InstructionData, VariableArgs, JumpData,
+use cretonne::repr::instructions::{Opcode, InstructionFormat, InstructionData, VariableArgs,
-                             BranchData, ReturnData};
+                                   JumpData, BranchData, ReturnData};
 use cretonne::repr::{Function, StackSlotData};
 
 pub use lexer::Location;
@@ -1039,7 +1039,7 @@ impl<'a> Parser<'a> {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use cretonne::types::{self, ArgumentType, ArgumentExtension};
+    use cretonne::repr::types::{self, ArgumentType, ArgumentExtension};
 
     #[test]
     fn argument_type() {

src/tools/print_cfg.rs

@@ -8,7 +8,7 @@ use std::io::{Read, Write, stdout};
 use CommandResult;
 use cretonne::repr::Function;
 use cretonne::cfg::ControlFlowGraph;
-use cretonne::instructions::InstructionData;
+use cretonne::repr::instructions::InstructionData;
 use cton_reader::parser::Parser;
 
 pub fn run(files: Vec<String>) -> CommandResult {