git.joshuawise.com
/
firearm.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
ec3250a
)
memory: ldm/stm ready for testing, hopefully
author
Christopher Lu
<lu@stop.hsd1.pa.comcast.net>
Wed, 7 Jan 2009 07:10:13 +0000
(
02:10
-0500)
committer
Christopher Lu
<lu@stop.hsd1.pa.comcast.net>
Wed, 7 Jan 2009 07:10:13 +0000
(
02:10
-0500)
Memory.v
patch
|
blob
|
blame
|
history
diff --git
a/Memory.v
b/Memory.v
index
0b27485
..
e04a804
100644
(file)
--- a/
Memory.v
+++ b/
Memory.v
@@
-37,7
+37,7
@@
module Memory(
output reg [31:0] out_write_data = 32'hxxxxxxxx
);
output reg [31:0] out_write_data = 32'hxxxxxxxx
);
- reg [31:0] addr, raddr, next_regdata;
+ reg [31:0] addr, raddr,
prev_raddr,
next_regdata;
reg [3:0] next_regsel, cur_reg, prev_reg;
reg next_writeback, next_notdone, next_inc_next;
reg [31:0] align_s1, align_s2, align_rddata;
reg [3:0] next_regsel, cur_reg, prev_reg;
reg next_writeback, next_notdone, next_inc_next;
reg [31:0] align_s1, align_s2, align_rddata;
@@
-49,6
+49,7
@@
module Memory(
reg [15:0] regs, next_regs;
reg started = 1'b0, next_started;
reg [15:0] regs, next_regs;
reg started = 1'b0, next_started;
+ reg [5:0] offset, prev_offset, offset_sel;
reg notdone = 1'b0;
reg inc_next = 1'b0;
reg notdone = 1'b0;
reg inc_next = 1'b0;
@@
-66,6
+67,8
@@
module Memory(
regs <= next_regs;
prev_reg <= cur_reg;
started <= next_started;
regs <= next_regs;
prev_reg <= cur_reg;
started <= next_started;
+ prev_offset <= offset;
+ prev_raddr <= raddr;
end
always @(*)
end
always @(*)
@@
-86,6
+89,7
@@
module Memory(
outstall = 1'b0;
next_regs = 16'b0;
next_started = started;
outstall = 1'b0;
next_regs = 16'b0;
next_started = started;
+ offset = prev_offset;
casez(insn)
`DECODE_LDRSTR_UNDEFINED: begin end
casez(insn)
`DECODE_LDRSTR_UNDEFINED: begin end
@@
-127,82
+131,87
@@
module Memory(
rd_req = insn[20];
wr_req = ~insn[20];
if(!started) begin
rd_req = insn[20];
wr_req = ~insn[20];
if(!started) begin
- next_regs = op1[15:0];
+// next_regs = insn[23] ? op1[15:0] : op1[0:15];
+ /** verilator can suck my dick */
+ next_regs = insn[23] ? op1[15:0] : {op1[0], op1[1], op1[2], op1[3], op1[4], op1[5], op1[6], op1[7],
+ op1[8], op1[9], op1[10], op1[11], op1[12], op1[13], op1[14], op1[15]};
+ offset = 6'b0;
next_started = 1'b1;
end
else if(inc_next) begin
if(insn[21]) begin
next_write_reg = 1'b1;
next_write_num = insn[19:16];
next_started = 1'b1;
end
else if(inc_next) begin
if(insn[21]) begin
next_write_reg = 1'b1;
next_write_num = insn[19:16];
- next_write_data =
op0
;
+ next_write_data =
insn[23] ? op0 + {26'b0, prev_offset} : op0 - {26'b0, prev_offset}
;
end
next_started = 1'b0;
end
else if(rw_wait) begin
next_regs = regs;
cur_reg = prev_reg;
end
next_started = 1'b0;
end
else if(rw_wait) begin
next_regs = regs;
cur_reg = prev_reg;
+ raddr = prev_raddr;
end
else begin
casez(regs)
16'b???????????????1: begin
cur_reg = 4'h0;
end
else begin
casez(regs)
16'b???????????????1: begin
cur_reg = 4'h0;
- next_regs =
regs & 16'b1111111111111110
;
+ next_regs =
{regs[15:1], 1'b0}
;
end
16'b??????????????10: begin
cur_reg = 4'h1;
end
16'b??????????????10: begin
cur_reg = 4'h1;
- next_regs =
regs & 16'b1111111111111100
;
+ next_regs =
{regs[15:2], 2'b0}
;
end
16'b?????????????100: begin
cur_reg = 4'h2;
end
16'b?????????????100: begin
cur_reg = 4'h2;
- next_regs =
regs & 16'b1111111111111000
;
+ next_regs =
{regs[15:3], 3'b0}
;
end
16'b????????????1000: begin
cur_reg = 4'h3;
end
16'b????????????1000: begin
cur_reg = 4'h3;
- next_regs =
regs & 16'b1111111111110000
;
+ next_regs =
{regs[15:4], 4'b0}
;
end
16'b???????????10000: begin
cur_reg = 4'h4;
end
16'b???????????10000: begin
cur_reg = 4'h4;
- next_regs =
regs & 16'b1111111111100000
;
+ next_regs =
{regs[15:5], 5'b0}
;
end
16'b??????????100000: begin
cur_reg = 4'h5;
end
16'b??????????100000: begin
cur_reg = 4'h5;
- next_regs =
regs & 16'b1111111111000000
;
+ next_regs =
{regs[15:6], 6'b0}
;
end
16'b?????????1000000: begin
cur_reg = 4'h6;
end
16'b?????????1000000: begin
cur_reg = 4'h6;
- next_regs =
regs & 16'b1111111110000000
;
+ next_regs =
{regs[15:7], 7'b0}
;
end
16'b????????10000000: begin
cur_reg = 4'h7;
end
16'b????????10000000: begin
cur_reg = 4'h7;
- next_regs =
regs & 16'b1111111100000000
;
+ next_regs =
{regs[15:8], 8'b0}
;
end
16'b???????100000000: begin
cur_reg = 4'h8;
end
16'b???????100000000: begin
cur_reg = 4'h8;
- next_regs =
regs & 16'b1111111000000000
;
+ next_regs =
{regs[15:9], 9'b0}
;
end
16'b??????1000000000: begin
cur_reg = 4'h9;
end
16'b??????1000000000: begin
cur_reg = 4'h9;
- next_regs =
regs & 16'b1111110000000000
;
+ next_regs =
{regs[15:10], 10'b0}
;
end
16'b?????10000000000: begin
cur_reg = 4'hA;
end
16'b?????10000000000: begin
cur_reg = 4'hA;
- next_regs =
regs & 16'b1111100000000000
;
+ next_regs =
{regs[15:11], 11'b0}
;
end
16'b????100000000000: begin
cur_reg = 4'hB;
end
16'b????100000000000: begin
cur_reg = 4'hB;
- next_regs =
regs & 16'b1111000000000000
;
+ next_regs =
{regs[15:12], 12'b0}
;
end
16'b???1000000000000: begin
cur_reg = 4'hC;
end
16'b???1000000000000: begin
cur_reg = 4'hC;
- next_regs =
regs & 16'b1110000000000000
;
+ next_regs =
{regs[15:13], 13'b0}
;
end
16'b??10000000000000: begin
cur_reg = 4'hD;
end
16'b??10000000000000: begin
cur_reg = 4'hD;
- next_regs =
regs & 16'b1100000000000000
;
+ next_regs =
{regs[15:14], 14'b0}
;
end
16'b?100000000000000: begin
cur_reg = 4'hE;
end
16'b?100000000000000: begin
cur_reg = 4'hE;
- next_regs =
regs & 16'b1000000000000000
;
+ next_regs =
{regs[15], 15'b0}
;
end
16'b1000000000000000: begin
cur_reg = 4'hF;
end
16'b1000000000000000: begin
cur_reg = 4'hF;
@@
-213,8
+222,23
@@
module Memory(
next_regs = 16'b0;
end
endcase
next_regs = 16'b0;
end
endcase
+ cur_reg = insn[23] ? 4'hF - cur_reg : cur_reg;
+ offset = prev_offset + 6'h4;
+ offset_sel = insn[24] ? offset : prev_offset;
+ raddr = insn[23] ? op0 + {26'b0, offset_sel} : op0 - {26'b0, offset_sel};
+
+ if(insn[20]) begin
+ next_write_reg = 1'b1;
+ next_write_num = cur_reg;
+ next_write_data = rd_data;
+ end
+
+ st_read = cur_reg;
+ wr_data = st_data;
+
next_inc_next = next_regs == 16'b0;
next_notdone = ~next_inc_next | (rw_wait & insn[20] & insn[21]);
next_inc_next = next_regs == 16'b0;
next_notdone = ~next_inc_next | (rw_wait & insn[20] & insn[21]);
+ busaddr = {raddr[31:2], 2'b0};
end
end
default: begin end
end
end
default: begin end
This page took
0.027143 seconds
and
4
git commands to generate.