Gate off vraminuse, oaminuse, etc with wehther the LCD is powered on. Make sure to...

diff --git a/LCDC.v b/LCDC.v
index 5089129580186afd34c64690a5abfb137bded485..86154433f0322641cfea4e00bbb5cc51e5b3f369 100644 (file)
--- a/LCDC.v
+++ b/LCDC.v
@@ -28,10 +28,9 @@ module LCDC(
        reg clk4 = 0;
        always @(posedge clk)
                clk4 = ~clk4;
        reg clk4 = 0;
        always @(posedge clk)
                clk4 = ~clk4;

-       assign lcdclk = clk4;

        
        /***** LCD control registers *****/
        
        /***** LCD control registers *****/

-       reg [7:0] rLCDC = 8'h91;
+       reg [7:0] rLCDC = 8'h00;

        reg [7:0] rSTAT = 8'h00;
        reg [7:0] rSCY = 8'b00;
        reg [7:0] rSCX = 8'b00;
        reg [7:0] rSTAT = 8'h00;
        reg [7:0] rSCY = 8'b00;
        reg [7:0] rSCX = 8'b00;


@@ -63,8 +62,8 @@ module LCDC(
        reg [8:0] posx = 9'h000;
        reg [7:0] posy = 8'h00;
        
        reg [8:0] posx = 9'h000;
        reg [7:0] posy = 8'h00;
        

-       wire vraminuse = (posx < 163) && (posy < 144);
-       wire oaminuse = (posx > 369) && (posy < 144);
+       wire vraminuse = (posx < 163) && (posy < 144) && rLCDC[7];
+       wire oaminuse = (posx > 369) && (posy < 144) && rLCDC[7];

        
        wire display = (posx > 2) && (posx < 163) && (posy < 144);
        
        
        wire display = (posx > 2) && (posx < 163) && (posy < 144);
        


@@ -77,8 +76,9 @@ module LCDC(
        wire [7:0] vxpos = rSCX + posx - 3;
        wire [7:0] vypos = rSCY + posy;
        
        wire [7:0] vxpos = rSCX + posx - 3;
        wire [7:0] vypos = rSCY + posy;
        

-       assign lcdvs = (posy == 153) && (posx == 2);
-       assign lcdhs = (posx == 2);
+       assign lcdvs = (posy == 153) && (posx == 2) && rLCDC[7];
+       assign lcdhs = (posx == 2) && rLCDC[7];
+       assign lcdclk = clk4 && rLCDC[7];

        
        wire [2:0] lcdr_ = display ? {pixdata[1] ? 3'b111 : 3'b000} : 3'b000;
        wire [2:0] lcdg_ = display ? {pixdata[0] ? 3'b111 : 3'b000} : 3'b000;
        
        wire [2:0] lcdr_ = display ? {pixdata[1] ? 3'b111 : 3'b000} : 3'b000;
        wire [2:0] lcdg_ = display ? {pixdata[0] ? 3'b111 : 3'b000} : 3'b000;

diff --git a/diag.asm b/diag.asm
index e9fff6a2ed3476cc8741888d142b8c65421d17de..668452decb47fea864ee0715b5b6649a189d4b43 100644 (file)
--- a/diag.asm
+++ b/diag.asm
@@ -33,6 +33,9 @@ main:
        ld hl, signon
        call puts
 
        ld hl, signon
        call puts
 

+       ld a, $91
+       ld [$FF40], a
+

        call putscreen
        
        ei
        call putscreen
        
        ei

diff --git a/insn_incdec_reg8.v b/insn_incdec_reg8.v
index 78f8b5a99dd315a645662d4ba484e59441af2d85..61464f68de903b31415638c4826d9701d0d59101 100644 (file)
--- a/insn_incdec_reg8.v
+++ b/insn_incdec_reg8.v
@@ -25,5 +25,10 @@
                `INSN_reg_H:    `_H <= tmp + (opcode[0] ? 8'hFF : 8'h01);
                `INSN_reg_L:    `_L <= tmp + (opcode[0] ? 8'hFF : 8'h01);
                endcase
                `INSN_reg_H:    `_H <= tmp + (opcode[0] ? 8'hFF : 8'h01);
                `INSN_reg_L:    `_L <= tmp + (opcode[0] ? 8'hFF : 8'h01);
                endcase

+               `_F <= {
+                               (tmp + (opcode[0] ? 8'hFF : 8'h01)) ? 1'b0 : 1'b1,
+                               1'b0,
+                               (({1'b0,tmp[3:0]} + (opcode[0] ? 5'h1F : 5'h01)) >> 4) ? 1'b1 : 1'b0,
+                               `_F[4:0]};

        end
 `endif
        end
 `endif