From: twinaphex Date: Fri, 18 Aug 2017 04:33:04 +0000 (+0200) Subject: Should hopefully fix PSP X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ebf923683facb316a0e9fc8d26a7a0b4e4bacbfc;p=picodrive.git Should hopefully fix PSP --- diff --git a/pico/draw.c b/pico/draw.c index cf638e90..bccb4d0c 100644 --- a/pico/draw.c +++ b/pico/draw.c @@ -35,7 +35,7 @@ int (*PicoScanBegin)(unsigned int num) = NULL; int (*PicoScanEnd) (unsigned int num) = NULL; static unsigned char DefHighCol[8+320+8]; -static unsigned char *HighColBase = DefHighCol; +unsigned char *HighColBase = DefHighCol; static int HighColIncrement; static unsigned int DefOutBuff[320*2/2]; diff --git a/pico/draw_amips.s b/pico/draw_amips.s index fa7906ee..0fa729e3 100644 --- a/pico/draw_amips.s +++ b/pico/draw_amips.s @@ -117,11 +117,11 @@ amips_clut_loop6: .macro TileEndCode xori $t8, $t9, 0xff beqz $t8, tile11111111 # common case - lui $v1, %hi(HighCol) + lui $v1, %hi(HighColBase) lui $t8, %hi(TileTable) ins $t8, $t9, 2, 8 lw $t8, %lo(TileTable)($t8) - lw $v1, %lo(HighCol)($v1) + lw $v1, %lo(HighColBase)($v1) jr $t8 addu $a0, $v1 .endm @@ -158,8 +158,8 @@ TileFlip: SingleColor: - lui $t9, %hi(HighCol) - lw $t9, %lo(HighCol)($t9) + lui $t9, %hi(HighColBase) + lw $t9, %lo(HighColBase)($t9) andi $t0, $a1, 0xf or $t0, $t0, $a2 addu $a0, $t9 @@ -178,7 +178,7 @@ TileEmpty: or $v0, $0, 1 # empty tile tile11111111: - lw $v1, %lo(HighCol)($v1) + lw $v1, %lo(HighColBase)($v1) or $t0, $t0, $a2 addu $a0, $v1 sb $t0, 0($a0)