Timer works.

diff --git a/FPGABoy.ise b/FPGABoy.ise
index a4399b8547dc1e3bf92fb75e1b95c105588e7337..227845500b0c7f94cfbe06aa62cec21e47c4f84e 100644 (file)
Binary files a/FPGABoy.ise and b/FPGABoy.ise differ

diff --git a/GBZ80Core.v b/GBZ80Core.v
index 96e4dcd38a164996df038dca0232ab82a837e90e..095d9e85e555d592bcdcca33ae6f23bee3ca663d 100644 (file)
--- a/GBZ80Core.v
+++ b/GBZ80Core.v
@@ -87,9 +87,9 @@
 
 module GBZ80Core(
        input clk,
 
 module GBZ80Core(
        input clk,

-       output reg [15:0] busaddress,   /* BUS_* is latched on STATE_FETCH. */
+       output reg [15:0] busaddress = 0,       /* BUS_* is latched on STATE_FETCH. */

        inout [7:0] busdata,
        inout [7:0] busdata,

-       output reg buswr, output reg busrd);
+       output reg buswr = 0, output reg busrd = 0);

        
        reg [1:0] state = 0;                                    /* State within this bus cycle (see STATE_*). */
        reg [2:0] cycle = 0;                                    /* Cycle for instructions. */
        
        reg [1:0] state = 0;                                    /* State within this bus cycle (see STATE_*). */
        reg [2:0] cycle = 0;                                    /* Cycle for instructions. */

diff --git a/Interrupt.v b/Interrupt.v
index 4e3d17d6312e59ea8966fa659e0c1e88a096ec69..1450b2cfd0b6ecf8c61e76f7ab8894cc96a3efe4 100644 (file)
--- a/Interrupt.v
+++ b/Interrupt.v
@@ -17,7 +17,7 @@ module Interrupt(
 
        wire [7:0] iflag = {3'b0,buttons,serial,tovf,lcdc,vblank};
        reg [7:0] imask = 16'hFFFF;
 
        wire [7:0] iflag = {3'b0,buttons,serial,tovf,lcdc,vblank};
        reg [7:0] imask = 16'hFFFF;

-       reg [7:0] ihold = 0;
+       reg [7:0] ihold = 8'b0;

        wire [7:0] imasked = ihold & imask;
 
        assign data = rd ?
        wire [7:0] imasked = ihold & imask;
 
        assign data = rd ?


@@ -34,12 +34,12 @@ module Interrupt(
                       imasked[3] ? 8'h58 :
                       imasked[4] ? 8'h60 : 8'h00;
 
                       imasked[3] ? 8'h58 :
                       imasked[4] ? 8'h60 : 8'h00;
 

-       always @ (negedge clk)
+       always @(negedge clk)

        begin
        begin

-               if (wr) begin
+               if (wr && (addr == `ADDR_IF || addr == `ADDR_IE)) begin

                        case(addr)
                        `ADDR_IF : ihold <= iflag | data;
                        case(addr)
                        `ADDR_IF : ihold <= iflag | data;

-                       `ADDR_IE : imask <= data;
+                       `ADDR_IE : begin imask <= data; ihold <= ihold | iflag; end

                        endcase
                        
                end
                        endcase
                        
                end

diff --git a/System.v b/System.v
index a5fee66e243e92a9079e66331d929075fe2e120d..8b8d61344f712e4c39cfae009bf71969f67039a9 100644 (file)
--- a/System.v
+++ b/System.v
@@ -151,7 +151,7 @@ module CoreTop(
 endmodule
 
 module TestBench();
 endmodule
 
 module TestBench();

-       reg clk = 0;
+       reg clk = 1;

        wire [15:0] addr;
        wire [7:0] data;
        wire wr, rd;
        wire [15:0] addr;
        wire [7:0] data;
        wire wr, rd;

diff --git a/Timer.v b/Timer.v
index 0481614f5c97586672ba16ed34265b0dcc04b4da..53f392deae20118ea451112fa123cf2a83391075 100644 (file)
--- a/Timer.v
+++ b/Timer.v
@@ -9,11 +9,11 @@ module Timer(
        input rd,
        input [15:0] addr,
        inout [7:0] data,
        input rd,
        input [15:0] addr,
        inout [7:0] data,

-       output reg irq);
+       output reg irq = 0);

 
        reg [7:0] tima = 0, tma = 0, tac = 0, div = 0;
        reg ovf = 0;
 
        reg [7:0] tima = 0, tma = 0, tac = 0, div = 0;
        reg ovf = 0;

-       reg [9:0] clkdv;
+       reg [9:0] clkdv = 0;

 
        wire is_tima = addr == `ADDR_TIMA;
        wire is_tma  = addr == `ADDR_TMA;
 
        wire is_tima = addr == `ADDR_TIMA;
        wire is_tma  = addr == `ADDR_TMA;

diff --git a/rom.asm b/rom.asm
index 93f8524713edd8bb709ba7496a57f76d39295fcb..5527ea889a0bd0a9e07c39024757aabc5a2be5ad 100644 (file)
--- a/rom.asm
+++ b/rom.asm
@@ -4,7 +4,7 @@ main:
        ld c, $51       ; Note that we are alive.
        ld a, $FF
        ld [c],a
        ld c, $51       ; Note that we are alive.
        ld a, $FF
        ld [c],a

-
+       

        ld sp, $DFFF
 
        ld hl, signon
        ld sp, $DFFF
 
        ld hl, signon


@@ -105,7 +105,7 @@ waitsw:
        call puts
        
        ld c, $07
        call puts
        
        ld c, $07

-       ld a, $07       ;start timer, 4.096KHz
+       ld a, $04       ;start timer, 4.096KHz

        ld [c], a
        
        ld c, $51
        ld [c], a
        
        ld c, $51


@@ -138,13 +138,8 @@ testa:
        ret z
        xor a
        ld [c], a
        ret z
        xor a
        ld [c], a

-       ld hl, $D000
-       ld c, [hl]
-       inc bc
-       ld [hl], c
-       ld a, c
-       ld c, $50
-       ld [c], a
+       ld a, $41
+       call putc

        ret
 
 ; Core instruction basic acceptance tests.
        ret
 
 ; Core instruction basic acceptance tests.


@@ -258,10 +253,12 @@ insntest:
 putc:
        ld b, 0
        ld c, $50
 putc:
        ld b, 0
        ld c, $50

+       push af

 .waitport:
        ld a,[c]
        cp b
        jr nz,.waitport
 .waitport:
        ld a,[c]
        cp b
        jr nz,.waitport

+       pop af

        ld [c],a
        ret
 
        ld [c],a
        ret
 


@@ -269,6 +266,8 @@ puts:
        ld a, [hli]
        ld b, $00
        cp b
        ld a, [hli]
        ld b, $00
        cp b

-       ret z
+       jr z, .done

        call putc
        jr puts
        call putc
        jr puts

+.done:
+       ret