Apple-2-Tools/apple2ix
1
0
Fork 0
mirror of https://github.com/mauiaaron/apple2.git synced 2024-07-09 11:29:10 +00:00
Code Issues Projects Releases Wiki Activity

Refactor display macros

Browse Source
This commit is contained in:
Aaron Culliney 2014-05-17 15:47:18 -07:00
parent 95ff4adb08
commit e2e00b3485
2 changed files with 18 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/apple2.h
View File

@ -21,8 +21,6 @@
#include "config.h" #include "config.h"
#endif #endif
#define BANK2 0x10000
/* Code alignment */ /* Code alignment */
#if defined(__i486__) || defined(__i586__) #if defined(__i486__) || defined(__i586__)
#define ALIGN .balign 16 #define ALIGN .balign 16

40
src/asm386/display.S
View File

@ -126,23 +126,8 @@ PB_dynamic##X:\
movw %cx, (%eax); /* GM -> temp */\ movw %cx, (%eax); /* GM -> temp */\
decl %eax; \ decl %eax; \
\ \
/* calculate dynamic colors in temp array */\ /* ------------------------------------------------------------------------- */ \
DynamicCalculateColor(X,OPP_TABLE,INTERP_COLOR,ALT_INTERP_COLOR);\ /* calculate dynamic colors in temp array */ \
PB_plot_dynamic##X:\
leal SN(temp), %ebx; /* ebx = temp */\
incl %ebx;\
CalcHiresGM(BASE,%eax,GM); /* eax = GM */\
PlotPixelsExtra /* temp -> GM: 1 + 7 + 1 */\
PB_exit##X:\
popl %ecx; /* restore regs */ \
popl %ebx; \
popl %eax;
/* -------------------------------------------------------------------------
* Dynamic calculation of color at the edges of bytes.
* ------------------------------------------------------------------------- */
#define DynamicCalculateColor(X,OPP_TABLE,INTERP_COLOR,ALT_INTERP_COLOR);\
movw (%eax), %cx; \ movw (%eax), %cx; \
testb $0xFF, %ch; /* check right color */ \ testb $0xFF, %ch; /* check right color */ \
jz PB_next0##X; /* right black, do other end */ \ jz PB_next0##X; /* right black, do other end */ \
@ -155,8 +140,7 @@ PB_exit##X:\
jmp PB_next0##X; \ jmp PB_next0##X; \
PB_black0##X: \ PB_black0##X: \
movzwl SN(apple_ii_64k)(,EffectiveAddr_E,1), %ecx;\ movzwl SN(apple_ii_64k)(,EffectiveAddr_E,1), %ecx;\
movb %ch, %cl; \ movzbl %ch, %ecx; \
xorb %ch, %ch; \
leal SN(video__hires_##OPP_TABLE) \ leal SN(video__hires_##OPP_TABLE) \
(,%ecx,8), %ebx; \ (,%ecx,8), %ebx; \
incl %eax; \ incl %eax; \
@ -203,7 +187,19 @@ PB_next4##X: \
incl %eax; \ incl %eax; \
CalculateInterpColor(X,5,ALT_INTERP_COLOR); \ CalculateInterpColor(X,5,ALT_INTERP_COLOR); \
PB_next5##X: \ PB_next5##X: \
decw EffectiveAddr; decw EffectiveAddr; \
/* ------------------------------------------------------------------------- */ \
\
PB_plot_dynamic##X:\
leal SN(temp), %ebx; /* ebx = temp */\
incl %ebx;\
CalcHiresGM(BASE,%eax,GM); /* eax = GM */\
PlotPixelsExtra /* temp -> GM: 1 + 7 + 1 */\
PB_exit##X:\
popl %ecx; /* restore regs */ \
popl %ebx; \
popl %eax;
/* ------------------------------------------------------------------------- /* -------------------------------------------------------------------------
@ -315,7 +311,7 @@ update_cont_##X: \
pushl %edx; \ pushl %edx; \
pushl EffectiveAddr_E; \ pushl EffectiveAddr_E; \
\ \
andw $0xFFFF, EffectiveAddr; /* erase offset */ \ andl $0xFFFF, EffectiveAddr_E; /* erase offset */ \
btr $0, EffectiveAddr_E; /* normalize */ \ btr $0, EffectiveAddr_E; /* normalize */ \
movl EffectiveAddr_E, %ecx; /* ecx = mem addrs */ \ movl EffectiveAddr_E, %ecx; /* ecx = mem addrs */ \
subw OFF, EffectiveAddr; /* - graphics base */ \ subw OFF, EffectiveAddr; /* - graphics base */ \
@ -328,7 +324,7 @@ update_cont_##X: \
leal SN(apple_ii_64k), EffectiveAddr_E;\ leal SN(apple_ii_64k), EffectiveAddr_E;\
addl %ecx, EffectiveAddr_E; \ addl %ecx, EffectiveAddr_E; \
movl EffectiveAddr_E, %ecx; \ movl EffectiveAddr_E, %ecx; \
addl $BANK2, %ecx; \ addl $0x10000, %ecx; \
\ \
testb $0xFF, %bl; \ testb $0xFF, %bl; \
jz plot_dhires##X##_cont; \ jz plot_dhires##X##_cont; \