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
- from Rev 91 to Rev 104
- ↔ Reverse comparison
Rev 91 → Rev 104
/verilog/dac_spi_if.v
40,7 → 40,6
// $LastChangedBy: olivier.girard $ |
// $LastChangedDate: 2010-03-07 09:09:38 +0100 (Sun, 07 Mar 2010) $ |
//---------------------------------------------------------------------------- |
`include "timescale.v" |
|
module dac_spi_if ( |
|
/verilog/openmsp430/timescale.v
File deleted
verilog/openmsp430/timescale.v
Property changes :
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Index: verilog/openmsp430/omsp_frontend.v
===================================================================
--- verilog/openmsp430/omsp_frontend.v (revision 91)
+++ verilog/openmsp430/omsp_frontend.v (revision 104)
@@ -31,12 +31,14 @@
// - Olivier Girard, olgirard@gmail.com
//
//----------------------------------------------------------------------------
-// $Rev: 85 $
+// $Rev: 103 $
// $LastChangedBy: olivier.girard $
-// $LastChangedDate: 2011-01-28 22:05:37 +0100 (Fri, 28 Jan 2011) $
+// $LastChangedDate: 2011-03-05 15:44:48 +0100 (Sat, 05 Mar 2011) $
//----------------------------------------------------------------------------
-`include "timescale.v"
+`ifdef OMSP_NO_INCLUDE
+`else
`include "openMSP430_defines.v"
+`endif
module omsp_frontend (
@@ -774,4 +776,7 @@
endmodule // omsp_frontend
+`ifdef OMSP_NO_INCLUDE
+`else
`include "openMSP430_undefines.v"
+`endif
/verilog/openmsp430/omsp_alu.v
31,12 → 31,14
// - Olivier Girard, olgirard@gmail.com |
// |
//---------------------------------------------------------------------------- |
// $Rev: 37 $ |
// $Rev: 103 $ |
// $LastChangedBy: olivier.girard $ |
// $LastChangedDate: 2009-12-29 21:58:14 +0100 (Tue, 29 Dec 2009) $ |
// $LastChangedDate: 2011-03-05 15:44:48 +0100 (Sat, 05 Mar 2011) $ |
//---------------------------------------------------------------------------- |
`include "timescale.v" |
`ifdef OMSP_NO_INCLUDE |
`else |
`include "openMSP430_defines.v" |
`endif |
|
module omsp_alu ( |
|
147,8 → 149,8
|
// Mask the bit 8 for the Byte instructions for correct flags generation |
wire op_bit8_msk = ~exec_cycle | ~inst_bw; |
wire [16:0] op_src_in = {1'b0, op_src_inv[15:9], op_src_inv[8] & op_bit8_msk, op_src_inv[7:0]}; |
wire [16:0] op_dst_in = {1'b0, op_dst[15:9], op_dst[8] & op_bit8_msk, op_dst[7:0]}; |
wire [16:0] op_src_in = {1'b0, {op_src_inv[15:8] & {8{op_bit8_msk}}}, op_src_inv[7:0]}; |
wire [16:0] op_dst_in = {1'b0, {op_dst[15:8] & {8{op_bit8_msk}}}, op_dst[7:0]}; |
|
// Clear the source operand (= jump offset) for conditional jumps |
wire jmp_not_taken = (inst_jmp[`JL] & ~(status[3]^status[2])) | |
245,4 → 247,7
|
endmodule // omsp_alu |
|
`ifdef OMSP_NO_INCLUDE |
`else |
`include "openMSP430_undefines.v" |
`endif |
/verilog/openmsp430/omsp_register_file.v
31,12 → 31,14
// - Olivier Girard, olgirard@gmail.com |
// |
//---------------------------------------------------------------------------- |
// $Rev: 37 $ |
// $Rev: 103 $ |
// $LastChangedBy: olivier.girard $ |
// $LastChangedDate: 2009-12-29 21:58:14 +0100 (Tue, 29 Dec 2009) $ |
// $LastChangedDate: 2011-03-05 15:44:48 +0100 (Sat, 05 Mar 2011) $ |
//---------------------------------------------------------------------------- |
`include "timescale.v" |
`ifdef OMSP_NO_INCLUDE |
`else |
`include "openMSP430_defines.v" |
`endif |
|
module omsp_register_file ( |
|
342,4 → 344,7
|
endmodule // omsp_register_file |
|
`ifdef OMSP_NO_INCLUDE |
`else |
`include "openMSP430_undefines.v" |
`endif |
/verilog/openmsp430/periph/template_periph_8b.v
36,12 → 36,14
// - Olivier Girard, olgirard@gmail.com |
// |
//---------------------------------------------------------------------------- |
// $Rev: 74 $ |
// $Rev: 103 $ |
// $LastChangedBy: olivier.girard $ |
// $LastChangedDate: 2010-08-28 21:53:08 +0200 (Sat, 28 Aug 2010) $ |
// $LastChangedDate: 2011-03-05 15:44:48 +0100 (Sat, 05 Mar 2011) $ |
//---------------------------------------------------------------------------- |
`include "timescale.v" |
`ifdef OMSP_NO_INCLUDE |
`else |
`include "openMSP430_defines.v" |
`endif |
|
module template_periph_8b ( |
|
186,4 → 188,7
|
endmodule // template_periph_8b |
|
`ifdef OMSP_NO_INCLUDE |
`else |
`include "openMSP430_undefines.v" |
`endif |
/verilog/openmsp430/periph/omsp_gpio.v
31,12 → 31,14
// - Olivier Girard, olgirard@gmail.com |
// |
//---------------------------------------------------------------------------- |
// $Rev: 79 $ |
// $Rev: 103 $ |
// $LastChangedBy: olivier.girard $ |
// $LastChangedDate: 2010-11-23 20:36:16 +0100 (Tue, 23 Nov 2010) $ |
// $LastChangedDate: 2011-03-05 15:44:48 +0100 (Sat, 05 Mar 2011) $ |
//---------------------------------------------------------------------------- |
`include "timescale.v" |
`ifdef OMSP_NO_INCLUDE |
`else |
`include "openMSP430_defines.v" |
`endif |
|
module omsp_gpio ( |
|
825,4 → 827,7
|
endmodule // omsp_gpio |
|
`ifdef OMSP_NO_INCLUDE |
`else |
`include "openMSP430_undefines.v" |
`endif |
/verilog/openmsp430/periph/omsp_timerA.v
31,12 → 31,14
// - Olivier Girard, olgirard@gmail.com |
// |
//---------------------------------------------------------------------------- |
// $Rev: 37 $ |
// $Rev: 103 $ |
// $LastChangedBy: olivier.girard $ |
// $LastChangedDate: 2009-12-29 21:58:14 +0100 (Tue, 29 Dec 2009) $ |
// $LastChangedDate: 2011-03-05 15:44:48 +0100 (Sat, 05 Mar 2011) $ |
//---------------------------------------------------------------------------- |
`include "timescale.v" |
`ifdef OMSP_NO_INCLUDE |
`else |
`include "openMSP430_defines.v" |
`endif |
|
module omsp_timerA ( |
|
686,4 → 688,7
|
endmodule // omsp_timerA |
|
`ifdef OMSP_NO_INCLUDE |
`else |
`include "openMSP430_undefines.v" |
`endif |
/verilog/openmsp430/periph/template_periph_16b.v
36,12 → 36,14
// - Olivier Girard, olgirard@gmail.com |
// |
//---------------------------------------------------------------------------- |
// $Rev: 74 $ |
// $Rev: 103 $ |
// $LastChangedBy: olivier.girard $ |
// $LastChangedDate: 2010-08-28 21:53:08 +0200 (Sat, 28 Aug 2010) $ |
// $LastChangedDate: 2011-03-05 15:44:48 +0100 (Sat, 05 Mar 2011) $ |
//---------------------------------------------------------------------------- |
`include "timescale.v" |
`ifdef OMSP_NO_INCLUDE |
`else |
`include "openMSP430_defines.v" |
`endif |
|
module template_periph_16b ( |
|
179,4 → 181,7
|
endmodule // template_periph_16b |
|
`ifdef OMSP_NO_INCLUDE |
`else |
`include "openMSP430_undefines.v" |
`endif |
/verilog/openmsp430/omsp_multiplier.v
36,8 → 36,10
// $LastChangedBy: olivier.girard $ |
// $LastChangedDate: 2009-08-30 18:39:26 +0200 (Sun, 30 Aug 2009) $ |
//---------------------------------------------------------------------------- |
`include "timescale.v" |
`ifdef OMSP_NO_INCLUDE |
`else |
`include "openMSP430_defines.v" |
`endif |
|
module omsp_multiplier ( |
|
338,4 → 340,7
|
endmodule // omsp_multiplier |
|
`ifdef OMSP_NO_INCLUDE |
`else |
`include "openMSP430_undefines.v" |
`endif |
/verilog/openmsp430/omsp_dbg_uart.v
31,12 → 31,14
// - Olivier Girard, olgirard@gmail.com |
// |
//---------------------------------------------------------------------------- |
// $Rev: 74 $ |
// $Rev: 103 $ |
// $LastChangedBy: olivier.girard $ |
// $LastChangedDate: 2010-08-28 21:53:08 +0200 (Sat, 28 Aug 2010) $ |
// $LastChangedDate: 2011-03-05 15:44:48 +0100 (Sat, 05 Mar 2011) $ |
//---------------------------------------------------------------------------- |
`include "timescale.v" |
`ifdef OMSP_NO_INCLUDE |
`else |
`include "openMSP430_defines.v" |
`endif |
|
module omsp_dbg_uart ( |
|
265,4 → 267,7
|
endmodule // omsp_dbg_uart |
|
`ifdef OMSP_NO_INCLUDE |
`else |
`include "openMSP430_undefines.v" |
`endif |
/verilog/openmsp430/omsp_dbg_hwbrk.v
31,12 → 31,14
// - Olivier Girard, olgirard@gmail.com |
// |
//---------------------------------------------------------------------------- |
// $Rev: 59 $ |
// $Rev: 103 $ |
// $LastChangedBy: olivier.girard $ |
// $LastChangedDate: 2010-02-02 00:12:28 +0100 (Tue, 02 Feb 2010) $ |
// $LastChangedDate: 2011-03-05 15:44:48 +0100 (Sat, 05 Mar 2011) $ |
//---------------------------------------------------------------------------- |
`include "timescale.v" |
`ifdef OMSP_NO_INCLUDE |
`else |
`include "openMSP430_defines.v" |
`endif |
|
module omsp_dbg_hwbrk ( |
|
269,4 → 271,7
|
endmodule // omsp_dbg_hwbrk |
|
`ifdef OMSP_NO_INCLUDE |
`else |
`include "openMSP430_undefines.v" |
`endif |
/verilog/openmsp430/omsp_sfr.v
31,12 → 31,14
// - Olivier Girard, olgirard@gmail.com |
// |
//---------------------------------------------------------------------------- |
// $Rev: 37 $ |
// $Rev: 103 $ |
// $LastChangedBy: olivier.girard $ |
// $LastChangedDate: 2009-12-29 21:58:14 +0100 (Tue, 29 Dec 2009) $ |
// $LastChangedDate: 2011-03-05 15:44:48 +0100 (Sat, 05 Mar 2011) $ |
//---------------------------------------------------------------------------- |
`include "timescale.v" |
`ifdef OMSP_NO_INCLUDE |
`else |
`include "openMSP430_defines.v" |
`endif |
|
module omsp_sfr ( |
|
201,4 → 203,7
|
endmodule // omsp_sfr |
|
`ifdef OMSP_NO_INCLUDE |
`else |
`include "openMSP430_undefines.v" |
`endif |
/verilog/openmsp430/omsp_dbg.v
31,12 → 31,14
// - Olivier Girard, olgirard@gmail.com |
// |
//---------------------------------------------------------------------------- |
// $Rev: 84 $ |
// $Rev: 103 $ |
// $LastChangedBy: olivier.girard $ |
// $LastChangedDate: 2011-01-23 21:00:36 +0100 (Sun, 23 Jan 2011) $ |
// $LastChangedDate: 2011-03-05 15:44:48 +0100 (Sat, 05 Mar 2011) $ |
//---------------------------------------------------------------------------- |
`include "timescale.v" |
`ifdef OMSP_NO_INCLUDE |
`else |
`include "openMSP430_defines.v" |
`endif |
|
module omsp_dbg ( |
|
796,4 → 798,7
|
endmodule // dbg |
|
`ifdef OMSP_NO_INCLUDE |
`else |
`include "openMSP430_undefines.v" |
`endif |
/verilog/openmsp430/omsp_clock_module.v
35,12 → 35,14
// - Olivier Girard, olgirard@gmail.com |
// |
//---------------------------------------------------------------------------- |
// $Rev: 37 $ |
// $Rev: 103 $ |
// $LastChangedBy: olivier.girard $ |
// $LastChangedDate: 2009-12-29 21:58:14 +0100 (Tue, 29 Dec 2009) $ |
// $LastChangedDate: 2011-03-05 15:44:48 +0100 (Sat, 05 Mar 2011) $ |
//---------------------------------------------------------------------------- |
`include "timescale.v" |
`ifdef OMSP_NO_INCLUDE |
`else |
`include "openMSP430_defines.v" |
`endif |
|
module omsp_clock_module ( |
|
254,4 → 256,7
|
endmodule // omsp_clock_module |
|
`ifdef OMSP_NO_INCLUDE |
`else |
`include "openMSP430_undefines.v" |
`endif |
/verilog/openmsp430/omsp_watchdog.v
31,12 → 31,14
// - Olivier Girard, olgirard@gmail.com |
// |
//---------------------------------------------------------------------------- |
// $Rev: 34 $ |
// $Rev: 103 $ |
// $LastChangedBy: olivier.girard $ |
// $LastChangedDate: 2009-12-29 20:10:34 +0100 (Tue, 29 Dec 2009) $ |
// $LastChangedDate: 2011-03-05 15:44:48 +0100 (Sat, 05 Mar 2011) $ |
//---------------------------------------------------------------------------- |
`include "timescale.v" |
`ifdef OMSP_NO_INCLUDE |
`else |
`include "openMSP430_defines.v" |
`endif |
|
module omsp_watchdog ( |
|
214,4 → 216,7
|
endmodule // omsp_watchdog |
|
`ifdef OMSP_NO_INCLUDE |
`else |
`include "openMSP430_undefines.v" |
`endif |
/verilog/openmsp430/omsp_execution_unit.v
31,12 → 31,14
// - Olivier Girard, olgirard@gmail.com |
// |
//---------------------------------------------------------------------------- |
// $Rev: 37 $ |
// $Rev: 103 $ |
// $LastChangedBy: olivier.girard $ |
// $LastChangedDate: 2009-12-29 21:58:14 +0100 (Tue, 29 Dec 2009) $ |
// $LastChangedDate: 2011-03-05 15:44:48 +0100 (Sat, 05 Mar 2011) $ |
//---------------------------------------------------------------------------- |
`include "timescale.v" |
`ifdef OMSP_NO_INCLUDE |
`else |
`include "openMSP430_defines.v" |
`endif |
|
module omsp_execution_unit ( |
|
145,7 → 147,11
inst_type[`INST_JMP])) | dbg_reg_wr; |
|
wire reg_sp_wr = (((e_state==`E_IRQ_1) | (e_state==`E_IRQ_3)) & ~inst_irq_rst) | |
((e_state==`E_DST_RD) & (inst_so[`PUSH] | inst_so[`CALL])); |
((e_state==`E_DST_RD) & ((inst_so[`PUSH] & ~inst_as[`IDX] & |
~((inst_as[`INDIR] | inst_as[`INDIR_I]) & inst_src[1])) | |
inst_so[`CALL])) | |
((e_state==`E_SRC_AD) & (inst_so[`PUSH] & inst_as[`IDX])) | |
((e_state==`E_SRC_RD) & (inst_so[`PUSH] & ((inst_as[`INDIR] | inst_as[`INDIR_I]) & inst_src[1]))); |
|
wire reg_sr_wr = (e_state==`E_DST_RD) & inst_so[`RETI]; |
|
214,7 → 220,8
|
wire src_reg_dest_sel = (e_state==`E_IRQ_1) | |
(e_state==`E_IRQ_3) | |
((e_state==`E_DST_RD) & (inst_so[`PUSH] | inst_so[`CALL])); |
((e_state==`E_DST_RD) & (inst_so[`PUSH] | inst_so[`CALL])) | |
((e_state==`E_SRC_AD) & inst_so[`PUSH] & inst_as[`IDX]); |
|
wire src_mdb_in_val_sel = ((e_state==`E_DST_RD) & inst_so[`RETI]) | |
((e_state==`E_EXEC) & (inst_as[`INDIR] | inst_as[`INDIR_I] | |
257,7 → 264,9
wire dst_fffe_sel = (e_state==`E_IRQ_0) | |
(e_state==`E_IRQ_1) | |
(e_state==`E_IRQ_3) | |
((e_state==`E_DST_RD) & (inst_so[`PUSH] | inst_so[`CALL]) & ~inst_so[`RETI]); |
((e_state==`E_DST_RD) & (inst_so[`PUSH] | inst_so[`CALL]) & ~inst_so[`RETI]) | |
((e_state==`E_SRC_AD) & inst_so[`PUSH] & inst_as[`IDX]) | |
((e_state==`E_SRC_RD) & inst_so[`PUSH] & (inst_as[`INDIR] | inst_as[`INDIR_I]) & inst_src[1]); |
|
wire dst_reg_dest_sel = ((e_state==`E_DST_RD) & ~(inst_so[`PUSH] | inst_so[`CALL] | inst_ad[`ABS] | inst_so[`RETI])) | |
((e_state==`E_DST_WR) & ~inst_ad[`ABS]) | |
364,4 → 373,7
|
endmodule // omsp_execution_unit |
|
`ifdef OMSP_NO_INCLUDE |
`else |
`include "openMSP430_undefines.v" |
`endif |
/verilog/openmsp430/omsp_mem_backbone.v
31,12 → 31,14
// - Olivier Girard, olgirard@gmail.com |
// |
//---------------------------------------------------------------------------- |
// $Rev: 37 $ |
// $Rev: 103 $ |
// $LastChangedBy: olivier.girard $ |
// $LastChangedDate: 2009-12-29 21:58:14 +0100 (Tue, 29 Dec 2009) $ |
// $LastChangedDate: 2011-03-05 15:44:48 +0100 (Sat, 05 Mar 2011) $ |
//---------------------------------------------------------------------------- |
`include "timescale.v" |
`ifdef OMSP_NO_INCLUDE |
`else |
`include "openMSP430_defines.v" |
`endif |
|
module omsp_mem_backbone ( |
|
241,4 → 243,7
|
endmodule // omsp_mem_backbone |
|
`ifdef OMSP_NO_INCLUDE |
`else |
`include "openMSP430_undefines.v" |
`endif |
/verilog/openmsp430/openMSP430_defines.v
31,11 → 31,15
// - Olivier Girard, olgirard@gmail.com |
// |
//---------------------------------------------------------------------------- |
// $Rev: 74 $ |
// $Rev: 103 $ |
// $LastChangedBy: olivier.girard $ |
// $LastChangedDate: 2010-08-28 21:53:08 +0200 (Sat, 28 Aug 2010) $ |
// $LastChangedDate: 2011-03-05 15:44:48 +0100 (Sat, 05 Mar 2011) $ |
//---------------------------------------------------------------------------- |
//`define OMSP_NO_INCLUDE |
`ifdef OMSP_NO_INCLUDE |
`else |
`include "openMSP430_undefines.v" |
`endif |
|
//---------------------------------------------------------------------------- |
// SYSTEM CONFIGURATION |
/verilog/openmsp430/openMSP430.v
31,12 → 31,14
// - Olivier Girard, olgirard@gmail.com |
// |
//---------------------------------------------------------------------------- |
// $Rev: 71 $ |
// $Rev: 103 $ |
// $LastChangedBy: olivier.girard $ |
// $LastChangedDate: 2010-03-07 21:14:33 +0100 (Sun, 07 Mar 2010) $ |
// $LastChangedDate: 2011-03-05 15:44:48 +0100 (Sat, 05 Mar 2011) $ |
//---------------------------------------------------------------------------- |
`include "timescale.v" |
`ifdef OMSP_NO_INCLUDE |
`else |
`include "openMSP430_defines.v" |
`endif |
|
module openMSP430 ( |
|
464,4 → 466,7
|
endmodule // openMSP430 |
|
`ifdef OMSP_NO_INCLUDE |
`else |
`include "openMSP430_undefines.v" |
`endif |
/verilog/openMSP430_fpga.v
36,7 → 36,6
// $LastChangedBy: olivier.girard $ |
// $LastChangedDate: 2009-12-29 21:58:14 +0100 (Tue, 29 Dec 2009) $ |
//---------------------------------------------------------------------------- |
`include "timescale.v" |
`include "openMSP430_defines.v" |
|
module openMSP430_fpga ( |