URL
https://opencores.org/ocsvn/apbtoaes128/apbtoaes128/trunk
Subversion Repositories apbtoaes128
Compare Revisions
- This comparison shows the changes necessary to convert path
/apbtoaes128/trunk
- from Rev 8 to Rev 7
- ↔ Reverse comparison
Rev 8 → Rev 7
/rtl/host_interface.v
429,7 → 429,20
AES_CR: |
bus_out_mux = {{19{1'b0}}, aes_cr[10:7], 2'b00, aes_cr[6:0]}; |
AES_SR: |
bus_out_mux = {{29{1'b0}}, wr_err, rd_err, (ccf && ~PENABLE)?1'b1:((ccf_set && PENABLE))?1'b0:(ccfc && aes_cr_wr_en)?1'b0:1'b1}; |
begin |
|
bus_out_mux = {{29{1'b0}}, wr_err, rd_err, (ccf)?1'b1:(ccfc && aes_cr_wr_en)?1'b0:1'b1}; |
/* |
if(~ccfc && ~aes_cr_wr_en) |
begin |
bus_out_mux = {{29{1'b0}}, wr_err, rd_err, (ccf)?1'b1:(ccfc && aes_cr_wr_en)?1'b0:1'b1}; |
end |
else |
begin |
bus_out_mux = {{29{1'b0}}, wr_err, rd_err, (ccf_set | ccf)?1'b1:1'b0}; |
end |
*/ |
end |
AES_DINR, AES_DOUTR: |
bus_out_mux = col_bus; |
AES_KEYR0, AES_KEYR1, AES_KEYR2, AES_KEYR3: |
/rtl/datapath.v
318,8 → 318,7
if(l == 3) |
begin |
if(iv_en[l] || iv_cnt_en) |
//iv[l] <= (iv_cnt_sel) ? iv[l] + 1'b1 : bus_in; |
iv[l] <= (iv_cnt_sel) ? iv[l] : bus_in; |
iv[l] <= (iv_cnt_sel) ? iv[l] + 1'b1 : bus_in; |
end |
else |
begin |
329,7 → 328,7
|
if(bkp_en[l]) |
//bkp[l] <= (mode_ctr) ? bus_swap : ((mode_cbc && enc_dec) ? col_in : bkp_1[l]); |
bkp[l] <= (mode_ctr) ? bus_swap : ((mode_cbc && enc_dec)? col_in[32*(l + 1) - 1 : 32*l] : bkp_1[l]); |
bkp[l] <= (mode_ctr) ? bus_swap : ((mode_cbc && enc_dec) ? col_in[32*(l + 1) - 1 : 32*l] : bkp_1[l]); |
|
if(bkp_en[l]) |
bkp_1[l] <= col_in[32*(l + 1) - 1 : 32*l]; |