diff --git a/cores/Oric/build/Makefile b/cores/Oric/build/Makefile new file mode 100644 index 0000000..cb345af --- /dev/null +++ b/cores/Oric/build/Makefile @@ -0,0 +1,9 @@ +all: + ./makemy.sh +clean: + rm -rf COREn.ZX1 _impact.cmd _impact.log makemy.sh~ _ngo oric.bgn oric.bit oric_bitgen.xwbt \ + oric.bld oric.drc ORIC.lso oric_map.map oric_map.mrp oric_map.ncd oric_map.ngm ORIC_map.xrpt \ + oric.my.bit oric.ncd ORIC.ngc oric.ngd oric_ngdbuild.xrpt ORIC.ngr oric.pad oric_pad.csv \ + oric_pad.txt oric.par ORIC_par.xrpt oric.pcf oric.ptwx oric_summary.xml oric.syr oric.twr \ + oric.twx oric.unroutes oric_usage.xml oric.v4.bit oric.xpi ORIC_xst.xrpt out out.my par_usage_statistics.html \ + projnav.tmp usage_statistics_webtalk.html webtalk.log xlnx_auto_0_xdb _xmsgs xst diff --git a/cores/Oric/source/ula.vhd b/cores/Oric/source/ula.vhd index a9e9ead..a9f4001 100644 --- a/cores/Oric/source/ula.vhd +++ b/cores/Oric/source/ula.vhd @@ -419,17 +419,15 @@ begin u_ld_reg: process(CLK_24, lRELOAD_SEL, RESET_INT) begin - if (falling_edge(CLK_24)) then - if (RESET_INT = '1') then - lREG_INK <= (others=>'1'); - lREG_STYLE <= (others=>'0'); - lREG_PAPER <= (others=>'0'); - lREG_MODE <= (others=>'0'); - elsif (lRELOAD_SEL = '1') then - lREG_INK <= (others=>'1'); - lREG_STYLE <= (others=>'0'); - lREG_PAPER <= (others=>'0'); - end if; + if (RESET_INT = '1') then + lREG_INK <= (others=>'1'); + lREG_STYLE <= (others=>'0'); + lREG_PAPER <= (others=>'0'); + lREG_MODE <= (others=>'0'); + elsif (lRELOAD_SEL = '1') then + lREG_INK <= (others=>'1'); + lREG_STYLE <= (others=>'0'); + lREG_PAPER <= (others=>'0'); elsif rising_edge(CLK_24) then if (RELD_REG = '1' and isAttrib = '1') then case lREGHOLD(6 downto 3) is