URL
https://opencores.org/ocsvn/openmsp430/openmsp430/trunk
Subversion Repositories openmsp430
Compare Revisions
- This comparison shows the changes necessary to convert path
/openmsp430/trunk/fpga/actel_m1a3pl_dev_kit/rtl/verilog
- from Rev 82 to Rev 84
- ↔ Reverse comparison
Rev 82 → Rev 84
/openmsp430/omsp_dbg.v
202,7 → 202,14
parameter BRK3_ADDR1_D = (64'h1 << BRK3_ADDR1); |
`endif |
|
|
// PUC is localy used as a data. |
reg [1:0] puc_sync; |
always @ (posedge mclk or posedge por) |
if (por) puc_sync <= 2'b11; |
else puc_sync <= {puc_sync[0] , puc}; |
wire puc_s = puc_sync[1]; |
|
|
//============================================================================ |
// 2) REGISTER DECODER |
//============================================================================ |
298,7 → 305,7
reg [3:2] cpu_stat; |
|
wire cpu_stat_wr = reg_wr[CPU_STAT]; |
wire [3:2] cpu_stat_set = {dbg_swbrk, puc}; |
wire [3:2] cpu_stat_set = {dbg_swbrk, puc_s}; |
wire [3:2] cpu_stat_clr = ~dbg_din[3:2]; |
|
always @ (posedge mclk or posedge por) |
616,7 → 623,7
|
// Break after reset |
//-------------------------- |
wire halt_rst = cpu_ctl[`RST_BRK_EN] & puc; |
wire halt_rst = cpu_ctl[`RST_BRK_EN] & puc_s; |
|
|
// Freeze peripherals |
/openmsp430/omsp_watchdog.v
31,9 → 31,9
// - Olivier Girard, olgirard@gmail.com |
// |
//---------------------------------------------------------------------------- |
// $Rev: 37 $ |
// $Rev: 34 $ |
// $LastChangedBy: olivier.girard $ |
// $LastChangedDate: 2009-12-29 21:58:14 +0100 (Tue, 29 Dec 2009) $ |
// $LastChangedDate: 2009-12-29 20:10:34 +0100 (Tue, 29 Dec 2009) $ |
//---------------------------------------------------------------------------- |
`include "timescale.v" |
`include "openMSP430_defines.v" |
160,8 → 160,8
else nmi_sync <= {nmi_sync[1:0], nmi}; |
|
// Edge detection |
wire nmi_re = ~nmi_sync[2] & nmi_sync[0] & nmie; |
wire nmi_fe = nmi_sync[2] & ~nmi_sync[0] & nmie; |
wire nmi_re = ~nmi_sync[2] & nmi_sync[1] & nmie; |
wire nmi_fe = nmi_sync[2] & ~nmi_sync[1] & nmie; |
|
// NMI event |
wire nmi_evt = wdtctl[6] ? nmi_fe : nmi_re; |