Fixed typo: reg [31:0] aluOut = aluReg ---> wire [31:0] aluOut = aluReg
This commit is contained in:
@@ -27,9 +27,9 @@ module vga (
|
||||
|
||||
wire pixel_clk;
|
||||
|
||||
//`define VGA_MODE_640x480
|
||||
`define VGA_MODE_640x480
|
||||
//`define VGA_MODE_1024x768
|
||||
`define VGA_MODE_1280x1024
|
||||
//`define VGA_MODE_1280x1024
|
||||
|
||||
`ifdef VGA_MODE_640x480
|
||||
// PLL: converts system clock (48 MHz) to pixel clock (25.125 MHz for 640x480)
|
||||
|
||||
@@ -80,7 +80,7 @@ void draw_frame(int frame) {
|
||||
|
||||
/*
|
||||
* Tell the linker to put this function in BRAM instead of FLASH
|
||||
* (see CRT_BAREMETAL/spi_flash.ld).
|
||||
* (see CRT/spi_flash.ld).
|
||||
* Try this: comment-out the following line.
|
||||
*/
|
||||
|
||||
|
||||
@@ -14,10 +14,10 @@
|
||||
`define FAST
|
||||
|
||||
`ifdef FAST
|
||||
`define NRV_FEMTORV32_FAST_QUARK // Use the "fast Quark" version (minimalist, and can run code from SPI flash.
|
||||
`define NRV_FEMTORV32_FAST_QUARK // Use the "fast Quark" version (minimalist, and can run code from SPI flash).
|
||||
`define NRV_FREQ 60 // The "fast Quark" is validated at 60 MHz on the IceStick. Can overclock to 85 MHz.
|
||||
`else
|
||||
`define NRV_FEMTORV32_QUARK // Use the "Quark" version.
|
||||
`define NRV_FEMTORV32_QUARK // Use the "Quark" version (even more minimalist).
|
||||
`define NRV_FREQ 50 // The "Quark" is validated at 50 MHz on the IceStick. Can overclock to 75 MHz.
|
||||
`endif
|
||||
|
||||
|
||||
@@ -135,7 +135,7 @@ module FemtoRV32(
|
||||
wire [31:0] aluIn2 = isALUreg | isBranch ? rs2Data : (instr[6:5] == 2'b01 ? Simm : Iimm);
|
||||
// wire [31:0] aluIn2 = isALUreg | isBranch ? rs2Data : (isStore ? Simm : Iimm);
|
||||
|
||||
reg [31:0] aluOut = aluReg; // The output of the ALU (wired to the ALU register)
|
||||
wire [31:0] aluOut = aluReg; // The output of the ALU (wired to the ALU register)
|
||||
reg [31:0] aluReg; // The internal register of the ALU, used by shift.
|
||||
reg [4:0] aluShamt; // Current shift amount.
|
||||
|
||||
|
||||
@@ -132,7 +132,7 @@ module FemtoRV32(
|
||||
// ALUimm, Load, JALR: Iimm
|
||||
wire [31:0] aluIn2 = isALUreg | isBranch ? rs2Data : (isStore ? Simm : Iimm);
|
||||
|
||||
reg [31:0] aluOut = aluReg; // The output of the ALU (wired to the ALU register)
|
||||
wire [31:0] aluOut = aluReg; // The output of the ALU (wired to the ALU register)
|
||||
reg [31:0] aluReg; // The internal register of the ALU, used by shift.
|
||||
reg [4:0] aluShamt; // Current shift amount.
|
||||
|
||||
|
||||
Reference in New Issue
Block a user