Remove _ops.sv files

This commit is contained in:
Graham Edgecombe 2017-12-05 19:54:01 +00:00
parent 0c3b91e733
commit e7ae22bf31
7 changed files with 30 additions and 47 deletions

View file

@ -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 */

View file

@ -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

View file

@ -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 */

View file

@ -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

View file

@ -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"

View file

@ -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,

View file

@ -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