From e7ae22bf3105af0e8ff7bf27960aca86a739119f Mon Sep 17 00:00:00 2001
From: Graham Edgecombe <gpe@grahamedgecombe.com>
Date: Tue, 5 Dec 2017 19:54:01 +0000
Subject: [PATCH] Remove _ops.sv files

---
 rv32_alu.sv        | 17 ++++++++++++++++-
 rv32_alu_ops.sv    | 21 ---------------------
 rv32_branch.sv     |  8 +++++++-
 rv32_branch_ops.sv | 12 ------------
 rv32_decode.sv     |  6 +++---
 rv32_mem.sv        |  5 ++++-
 rv32_mem_ops.sv    |  8 --------
 7 files changed, 30 insertions(+), 47 deletions(-)
 delete mode 100644 rv32_alu_ops.sv
 delete mode 100644 rv32_branch_ops.sv
 delete mode 100644 rv32_mem_ops.sv

diff --git a/rv32_alu.sv b/rv32_alu.sv
index 19179d3..807b717 100644
--- a/rv32_alu.sv
+++ b/rv32_alu.sv
@@ -1,7 +1,22 @@
 `ifndef RV32_ALU
 `define RV32_ALU
 
-`include "rv32_alu_ops.sv"
+localparam RV32_ALU_OP_ADD_SUB = 4'b0000;
+localparam RV32_ALU_OP_XOR     = 4'b0001;
+localparam RV32_ALU_OP_OR      = 4'b0010;
+localparam RV32_ALU_OP_AND     = 4'b0011;
+localparam RV32_ALU_OP_SLL     = 4'b0100;
+localparam RV32_ALU_OP_SRL_SRA = 4'b0101;
+localparam RV32_ALU_OP_SLT     = 4'b0110;
+localparam RV32_ALU_OP_SLTU    = 4'b0111;
+localparam RV32_ALU_OP_SRC1P4  = 4'b1000;
+localparam RV32_ALU_OP_SRC2    = 4'b1001;
+
+localparam RV32_ALU_SRC1_REG = 1'b0;
+localparam RV32_ALU_SRC1_PC  = 1'b1;
+
+localparam RV32_ALU_SRC2_REG = 1'b0;
+localparam RV32_ALU_SRC2_IMM = 1'b1;
 
 module rv32_alu (
     /* control in */
diff --git a/rv32_alu_ops.sv b/rv32_alu_ops.sv
deleted file mode 100644
index 163bc7b..0000000
--- a/rv32_alu_ops.sv
+++ /dev/null
@@ -1,21 +0,0 @@
-`ifndef RV32_ALU_OPS
-`define RV32_ALU_OPS
-
-localparam RV32_ALU_OP_ADD_SUB = 4'b0000;
-localparam RV32_ALU_OP_XOR     = 4'b0001;
-localparam RV32_ALU_OP_OR      = 4'b0010;
-localparam RV32_ALU_OP_AND     = 4'b0011;
-localparam RV32_ALU_OP_SLL     = 4'b0100;
-localparam RV32_ALU_OP_SRL_SRA = 4'b0101;
-localparam RV32_ALU_OP_SLT     = 4'b0110;
-localparam RV32_ALU_OP_SLTU    = 4'b0111;
-localparam RV32_ALU_OP_SRC1P4  = 4'b1000;
-localparam RV32_ALU_OP_SRC2    = 4'b1001;
-
-localparam RV32_ALU_SRC1_REG = 1'b0;
-localparam RV32_ALU_SRC1_PC  = 1'b1;
-
-localparam RV32_ALU_SRC2_REG = 1'b0;
-localparam RV32_ALU_SRC2_IMM = 1'b1;
-
-`endif
diff --git a/rv32_branch.sv b/rv32_branch.sv
index a88a80e..0129420 100644
--- a/rv32_branch.sv
+++ b/rv32_branch.sv
@@ -1,7 +1,13 @@
 `ifndef RV32_BRANCH
 `define RV32_BRANCH
 
-`include "rv32_branch_ops.sv"
+localparam RV32_BRANCH_OP_NEVER    = 3'b00;
+localparam RV32_BRANCH_OP_ZERO     = 3'b01;
+localparam RV32_BRANCH_OP_NON_ZERO = 3'b10;
+localparam RV32_BRANCH_OP_ALWAYS   = 3'b11;
+
+localparam RV32_BRANCH_PC_SRC_IMM = 1'b0;
+localparam RV32_BRANCH_PC_SRC_REG = 1'b1;
 
 module rv32_branch_pc_mux (
     /* control in */
diff --git a/rv32_branch_ops.sv b/rv32_branch_ops.sv
deleted file mode 100644
index ebbc910..0000000
--- a/rv32_branch_ops.sv
+++ /dev/null
@@ -1,12 +0,0 @@
-`ifndef RV32_BRANCH_OPS
-`define RV32_BRANCH_OPS
-
-localparam RV32_BRANCH_OP_NEVER    = 3'b00;
-localparam RV32_BRANCH_OP_ZERO     = 3'b01;
-localparam RV32_BRANCH_OP_NON_ZERO = 3'b10;
-localparam RV32_BRANCH_OP_ALWAYS   = 3'b11;
-
-localparam RV32_BRANCH_PC_SRC_IMM = 1'b0;
-localparam RV32_BRANCH_PC_SRC_REG = 1'b1;
-
-`endif
diff --git a/rv32_decode.sv b/rv32_decode.sv
index 9b47242..d722b5b 100644
--- a/rv32_decode.sv
+++ b/rv32_decode.sv
@@ -1,9 +1,9 @@
 `ifndef RV32_DECODE
 `define RV32_DECODE
 
-`include "rv32_alu_ops.sv"
-`include "rv32_branch_ops.sv"
-`include "rv32_mem_ops.sv"
+`include "rv32_alu.sv"
+`include "rv32_branch.sv"
+`include "rv32_mem.sv"
 `include "rv32_opcodes.sv"
 `include "rv32_regs.sv"
 
diff --git a/rv32_mem.sv b/rv32_mem.sv
index 1e165ac..9106ab9 100644
--- a/rv32_mem.sv
+++ b/rv32_mem.sv
@@ -2,7 +2,10 @@
 `define RV32_MEM
 
 `include "rv32_branch.sv"
-`include "rv32_mem_ops.sv"
+
+localparam RV32_MEM_WIDTH_WORD = 2'b00;
+localparam RV32_MEM_WIDTH_HALF = 2'b01;
+localparam RV32_MEM_WIDTH_BYTE = 2'b10;
 
 module rv32_mem (
     input clk,
diff --git a/rv32_mem_ops.sv b/rv32_mem_ops.sv
deleted file mode 100644
index 60f882b..0000000
--- a/rv32_mem_ops.sv
+++ /dev/null
@@ -1,8 +0,0 @@
-`ifndef RV32_MEM_OPS
-`define RV32_MEM_OPS
-
-localparam RV32_MEM_WIDTH_WORD = 2'b00;
-localparam RV32_MEM_WIDTH_HALF = 2'b01;
-localparam RV32_MEM_WIDTH_BYTE = 2'b10;
-
-`endif