bubble: initial assembly

This commit is contained in:
Vince Weaver 2023-12-31 01:17:33 -05:00
parent 9269635d8f
commit 4b5e660764
4 changed files with 694 additions and 22 deletions

View File

@ -7,10 +7,11 @@ EMPTY_DISK = ../../../empty_disk
all: bubble.dsk
bubble.dsk: HELLO BUBBLE.BAS
bubble.dsk: HELLO BUBBLE.BAS BUBBLE
cp $(EMPTY_DISK)/empty.dsk bubble.dsk
$(DOS33) -y bubble.dsk SAVE A HELLO
$(DOS33) -y bubble.dsk SAVE A BUBBLE.BAS
$(DOS33) -y bubble.dsk BSAVE -a 0x0C00 BUBBLE
###
@ -19,6 +20,14 @@ HELLO: hello.bas
###
BUBBLE: bubble.o
ld65 -o BUBBLE bubble.o -C $(LINKER_SCRIPTS)/apple2_c00.inc
bubble.o: bubble.s
ca65 -o bubble.o bubble.s -l bubble.lst
###
BUBBLE.BAS: bubble.bas
$(TOKENIZE) < bubble.bas > BUBBLE.BAS
@ -26,5 +35,4 @@ BUBBLE.BAS: bubble.bas
###
clean:
rm -f *~ *.o *.lst BUBBLE.BAS HELLO
rm -f *~ *.o *.lst BUBBLE.BAS HELLO BUBBLE

View File

@ -0,0 +1,361 @@
; bubble universe -- Apple II Hires
; soft-switches
KEYPRESS = $C000
KEYRESET = $C010
PAGE1 = $C054
PAGE2 = $C055
; ROM routines
BKGND0 = $F3F4 ; clear current page to A
HGR2 = $F3D8 ; set hires page2 and clear $4000-$5fff
HGR = $F3E2 ; set hires page1 and clear $2000-$3fff
HPLOT0 = $F457 ; plot at (Y,X), (A)
HLINRL = $F530 ; line to (X,A), (Y)
HCOLOR1 = $F6F0 ; set HGR_COLOR to value in X
COLORTBL = $F6F6
WAIT = $FCA8 ; delay 1/2(26+27A+5A^2) us
; zero page
HPLOTXL = $90
HPLOTXH = $91
HPLOTYL = $92
HPLOTYH = $93
IVL = $94
IVH = $95
RXL = $96
RXH = $97
OUT1L = $98
OUT1H = $99
OUT2L = $9A
OUT2H = $9B
STEMP1L = $9C
STEMP1H = $9D
STEMP2L = $9E
STEMP2H = $9F
I = $D0
J = $D1
XL = $D4
XH = $D5
VL = $D6
VH = $D7
TL = $DA
TH = $DB
UL = $DC
UH = $DD
HGR_PAGE = $E6
; const
NUM = 32
bubble:
jsr HGR2
ldx #7
jsr HCOLOR1
lda #0
sta XL
sta XH
sta VL
sta VH
sta TL
sta TH
next_frame:
lda #0
jsr BKGND0
main_loop:
; clear screen: TODO
ldx #0
stx I
outer_loop:
ldx #0
stx J
inner_loop:
; fixed_add(rh[i],rl[i],xh,xl,&rxh,&rxl);
ldx I ; 3
clc ; 2
lda rl,X
adc XL ; 3
sta RXL ; 3
lda rh,X
adc XH ; 3
sta RXH ; 3
; fixed_add(i,0,vh,vl,&ivh,&ivl);
clc
lda #0
adc VL
sta IVL
lda I
adc VH
sta IVH
; U=SIN(I+V)+SIN(RR+X)
; float_to_fixed(sin(ivh,ivl) + sin(rxh,rxl), &uh,&ul);
ldy #0
jsr sin
ldy #2
jsr sin
clc
lda OUT1L
adc OUT2L
sta UL
lda OUT1H
adc OUT2H
sta UH
; V=COS(I+V)+COS(RR+X)
; float_to_fixed(cos(ivh,ivl) + cos(rxh,rxl), &vh,&vl);
ldy #0
jsr cos
ldy #2
jsr cos
clc
lda OUT1L
adc OUT2L
sta VL
lda OUT1H
adc OUT2H
sta VH
; X=U+T
; fixed_add(uh,ul,th,tl,&xh,&xl);
clc
lda UL
adc TL
sta XL
lda UH
adc TH
sta XH
; HPLOT 32*U+140,32*V+96
; hplot(48*fixed_to_float(uh,ul)+140,
; 48*fixed_to_float(vh,vl)+96);
; HPLOT0 plot at (Y,X), (A)
lda UL
sta HPLOTYL
lda UH
asl HPLOTYL
rol
asl HPLOTYL
rol
asl HPLOTYL
rol
asl HPLOTYL
rol
asl HPLOTYL
rol
clc
adc #140
tax
lda VL
sta HPLOTYL
lda VH
asl HPLOTYL
rol
asl HPLOTYL
rol
asl HPLOTYL
rol
asl HPLOTYL
rol
asl HPLOTYL
rol
clc
adc #96
ldy #0 ; never bigger than 140+48 = 188
; ldx #140
; lda #96
jsr HPLOT0
inc J
lda J
cmp #NUM
beq done_j
jmp inner_loop
done_j:
inc I
lda I
cmp #NUM
beq done_i
jmp outer_loop
done_i:
; t=t+(1.0/32.0);
; 1/2 1/4 1/8 1/16 | 1/32 1/64 1/128 1/256
; $0x08
clc
lda TL
adc #$8
sta TL
lda #0
adc TH
sta TH
end:
; flip pages
; if $20 (draw PAGE1) draw PAGE2, SHOW page1
; if $40 (draw PAGE2) draw PAGE1, SHOW page2
lda HGR_PAGE
eor #$60
sta HGR_PAGE
cmp #$40
bne flip2
flip1:
bit PAGE1
jmp next_frame
flip2:
bit PAGE2
jmp next_frame
;=======================
sin:
; / 6.28 is roughly the same as *0.16
; = .5 .25 .125 .0625 .03125
; 1/6.28 = 0.16 = 0 0 1 0 1 0 0 0 = 0x28
; i=(i*0x28)>>8;
lda IVL,Y
sta STEMP1L
lda IVH,Y
sta STEMP1H
already_loaded:
; i2=i<<3;
asl STEMP1L
ror STEMP1H
asl STEMP1L
ror STEMP1H
asl STEMP1L
ror STEMP1H
; i1=i<<5;
lda STEMP1L
sta STEMP2L
lda STEMP1H
sta STEMP2H
asl STEMP1L
ror STEMP1H
asl STEMP1L
ror STEMP1H
; i=(i1+i2)>>8;
clc
lda STEMP1L
adc STEMP2L
sta STEMP1L
lda STEMP1H
adc STEMP2H
sta STEMP1H
ldx STEMP1H
; sl=fsinh[i];
lda sin_lookup,X
asl
sta OUT1L,Y
bcc sin_negative
sin_positive:
lda #$0
beq set_sin_sign
sin_negative:
lda #$FF
set_sin_sign:
sta OUT1H,Y
rts
;=============================
cos:
; 1.57 is roughly 0x0192 in 8.8
clc
lda IVL,Y
adc #$92
sta STEMP1L
lda IVH,Y
adc #1
sta STEMP1H
jmp already_loaded
rh:
.byte $00,$00,$00,$00,$00,$00,$00,$00
.byte $00,$00,$00,$00,$00,$00,$00,$00
.byte $00,$00,$00,$00,$00,$00,$00,$00
.byte $00,$00,$00,$00,$00,$00,$00,$00
rl:
.byte $00,$06,$0C,$12,$19,$1F,$25,$2B
.byte $32,$38,$3E,$45,$4B,$51,$57,$5E
.byte $64,$6A,$71,$77,$7D,$83,$8A,$90
.byte $96,$9D,$A3,$A9,$AF,$B6,$BC,$C2
sin_lookup:
.byte $00,$03,$06,$09,$0C,$0F,$12,$15,$18,$1C,$1F,$22,$25,$28,$2B,$2E
.byte $30,$33,$36,$39,$3C,$3F,$41,$44,$47,$49,$4C,$4E,$51,$53,$55,$58
.byte $5A,$5C,$5E,$60,$62,$64,$66,$68,$6A,$6C,$6D,$6F,$70,$72,$73,$74
.byte $76,$77,$78,$79,$7A,$7B,$7C,$7C,$7D,$7E,$7E,$7F,$7F,$7F,$7F,$7F
.byte $7F,$7F,$7F,$7F,$7F,$7F,$7E,$7E,$7D,$7C,$7C,$7B,$7A,$79,$78,$77
.byte $76,$75,$73,$72,$70,$6F,$6D,$6C,$6A,$68,$66,$64,$63,$61,$5E,$5C
.byte $5A,$58,$56,$53,$51,$4E,$4C,$49,$47,$44,$41,$3F,$3C,$39,$36,$34
.byte $31,$2E,$2B,$28,$25,$22,$1F,$1C,$19,$16,$12,$0F,$0C,$09,$06,$03
.byte $00,$FE,$FA,$F7,$F4,$F1,$EE,$EB,$E8,$E5,$E2,$DF,$DC,$D9,$D6,$D3
.byte $D0,$CD,$CA,$C7,$C4,$C2,$BF,$BC,$BA,$B7,$B4,$B2,$AF,$AD,$AB,$A8
.byte $A6,$A4,$A2,$A0,$9E,$9C,$9A,$98,$96,$95,$93,$91,$90,$8E,$8D,$8C
.byte $8A,$89,$88,$87,$86,$85,$84,$84,$83,$82,$82,$81,$81,$81,$81,$81
.byte $81,$81,$81,$81,$81,$81,$82,$82,$83,$84,$84,$85,$86,$87,$88,$89
.byte $8A,$8B,$8D,$8E,$8F,$91,$93,$94,$96,$98,$99,$9B,$9D,$9F,$A1,$A4
.byte $A6,$A8,$AA,$AD,$AF,$B1,$B4,$B6,$B9,$BC,$BE,$C1,$C4,$C7,$C9,$CC
.byte $CF,$D2,$D5,$D8,$DB,$DE,$E1,$E4,$E7,$EA,$ED,$F0,$F4,$F7,$FA,$FD

View File

@ -11,23 +11,171 @@
#include "tfv_utils.h"
#include "tfv_zp.h"
#define NUM 32
static double fixed_to_float(int8_t hi, uint8_t lo) {
int temp=(hi<<8)|lo;
return temp/256.0;
}
static void float_to_fixed(double input, int8_t *hi, uint8_t *lo) {
int temp;
if (input>255) printf("float_to_fixed: %lf too big\n",input);
if (input<-255) printf("float_to_fixed: %lf too small\n",input);
temp=input*256;
*hi=temp>>8;
*lo=temp&0xff;
return;
}
static void fixed_add(int8_t add1h,uint8_t add1l,
int8_t add2h,uint8_t add2l,
int8_t *outh,uint8_t *outl) {
int a1,a2,s;
a1=(add1h<<8)|add1l;
a2=(add2h<<8)|add2l;
s=a1+a2;
*outh=(s>>8)&0xff;
*outl=(s&0xff);
}
int8_t fsinh[256];
double sine(int8_t fh, uint8_t fl) {
double f;
int i;
int i1,i2;
int8_t sh;
uint8_t sl;
// f=(fh<<8)|fl;
// f=f/256.0;
// i=f;
i=(fh<<8)|fl;
// /6.28, 0=0, 6.28=0xff
// .035
// = .5 .25 .125 .0625 .03125
// 1/6.28 = 0.16 = 0 0 1 0 1 0 0 0 = 0x28
// 8.8 * 8.8 = 16.16
// i=(i/6.28);
// i=(i/8.0);
// i=i*0.15625;
// i=(i*0x28)>>8;
i1=i<<5;
i2=i<<3;
i=(i1+i2)>>8;
i=i&0xff;
// i=i&0xff;
// f=(fsinh[i]/128.0);
sl=fsinh[i];
if (sl&0x80) sh=0xff;
else sh=0x00;
sl=sl<<1;
f=fixed_to_float(sh,sl);
return f;
// f=fixed_to_float(fh,fl);
// return sin(f);
}
double cose(int8_t fh, uint8_t fl) {
int8_t temph;
uint8_t templ;
// double f;
// int i;
// i=(fh<<8)|fl;
// i=((i>>4)+64)&0xff;
// f=(fh<<8)|fl;
// f=f/256.0;
// i=f/6.28;
// i=(i+64)&0xff;
// f=(fsinh[i]/128.0);
// return f;
// 1.57 is roughly 0x0192 in 8.8
fixed_add(fh,fl,0x1,0x92,&temph,&templ);
return sine(temph,templ);
}
int main(int argc, char **argv) {
int ch;
int n,i,j;
double r,rr,t,xx=0,u=0,v=0;//,sz,sw,sh;
int i,j;
double r;
int8_t th,xh,rxh,ivh,vh,uh,rh[NUM];
uint8_t tl,xl,rxl,ivl,vl,ul,rl[NUM];
grsim_init();
printf("XX=%lf\n",xx);
// HCOLOR=7
hcolor_equals(7);
// N=200:R=6.28/235:T=0:SZ=200:SW=280/SZ:SH=SCRH/SZ
n=32; r=6.28/235.0;
t=0;
r=6.28/256.0;
th=0; tl=0;
uh=0; ul=0;
vh=0; vl=0;
xh=0; xl=0;
rxh=0; rxl=0;
for(i=0;i<256;i++) {
fsinh[i]=(128*sin(6.28*i/256.0));
}
// for(i=0;i<256;i++) printf("%d\n",fsinh[i]);
for(i=0;i<NUM;i++) {
float_to_fixed(r*i,&rh[i],&rl[i]);
}
// HGR2:FOR I=0 TO N:RR=R*I:FOR J=0 TO N
@ -35,30 +183,51 @@ int main(int argc, char **argv) {
soft_switch(MIXCLR);
while(1) {
hclr();
for(i=0;i<NUM;i++) {
for(j=0;j<NUM;j++) {
fixed_add(rh[i],rl[i],xh,xl,&rxh,&rxl);
fixed_add(i,0,vh,vl,&ivh,&ivl);
clear_screens();
for(i=0;i<n;i++) {
rr=r*i;
for(j=0;j<n;j++) {
//U=SIN(I+V)+SIN(RR+X)
u=sin(i+v)+sin(rr+xx);
float_to_fixed(
sine(ivh,ivl) +
sine(rxh,rxl),
&uh,&ul);
//V=COS(I+V)+COS(RR+X)
v=cos(i+v)+cos(rr+xx);
float_to_fixed(
cose(ivh,ivl) +
cose(rxh,rxl),
&vh,&vl);
// X=U+T
xx=u+t;
//float_to_fixed( (u+fixed_to_float(th,tl)),&xh,&xl);
fixed_add(uh,ul,th,tl,&xh,&xl);
//HPLOT 32*U+140,32*V+96
hplot(48*u+140,48*v+96);
hplot(48*fixed_to_float(uh,ul)+140,
48*fixed_to_float(vh,vl)+96);
}
}
grsim_update();
usleep(100000);
ch=grsim_input();
if (ch=='q') exit(0);
t=t+.025;
grsim_update();
usleep(100000);
ch=grsim_input();
if (ch=='q') exit(0);
//t=t+(1.0/32.0);
// 1/2 1/4 1/8 1/16 | 1/32 1/64 1/128 1/256
fixed_add(th,tl,0,0x8,&th,&tl);
// printf("%x %x\n",th,tl);
}
return 0;

View File

@ -0,0 +1,134 @@
/* Bubble */
#include <stdint.h>
#include <stdio.h>
#include <string.h>
#include <unistd.h>
#include <stdlib.h>
#include <math.h>
#include "gr-sim.h"
#include "tfv_utils.h"
#include "tfv_zp.h"
#define NUM 32
static double fixed_to_float(int8_t hi, uint8_t lo) {
int temp=(hi<<8)|lo;
return temp/256.0;
}
static void float_to_fixed(double input, int8_t *hi, uint8_t *lo) {
int temp;
if (input>255) printf("float_to_fixed: %lf too big\n",input);
if (input<-255) printf("float_to_fixed: %lf too small\n",input);
temp=input*256;
*hi=temp>>8;
*lo=temp&0xff;
return;
}
static void fixed_add(int8_t add1h,uint8_t add1l,
int8_t add2h,uint8_t add2l,
int8_t *outh,uint8_t *outl) {
int a1,a2,s;
a1=(add1h<<8)|add1l;
a2=(add2h<<8)|add2l;
s=a1+a2;
*outh=(s>>8)&0xff;
*outl=(s&0xff);
}
int main(int argc, char **argv) {
int ch;
int i,j;
double r,u=0;
int8_t th,xh,rxh,ivh,vh,uh,rh[NUM];
uint8_t tl,xl,rxl,ivl,vl,ul,rl[NUM];
grsim_init();
// HCOLOR=7
hcolor_equals(7);
// N=200:R=6.28/235:T=0:SZ=200:SW=280/SZ:SH=SCRH/SZ
r=6.28/256.0;
th=0; tl=0;
uh=0; ul=0;
vh=0; vl=0;
xh=0; xl=0;
rxh=0; rxl=0;
for(i=0;i<NUM;i++) {
float_to_fixed(r*i,&rh[i],&rl[i]);
}
// HGR2:FOR I=0 TO N:RR=R*I:FOR J=0 TO N
hgr();
soft_switch(MIXCLR);
while(1) {
hclr();
for(i=0;i<NUM;i++) {
for(j=0;j<NUM;j++) {
fixed_add(rh[i],rl[i],xh,xl,&rxh,&rxl);
fixed_add(i,0,vh,vl,&ivh,&ivl);
//U=SIN(I+V)+SIN(RR+X)
u=sin(fixed_to_float(ivh,ivl)) +
sin(fixed_to_float(rxh,rxl));
//V=COS(I+V)+COS(RR+X)
float_to_fixed(
(cos(fixed_to_float(ivh,ivl)) +
cos(fixed_to_float(rxh,rxl))),
&vh,&vl);
// X=U+T
//float_to_fixed( (u+fixed_to_float(th,tl)),&xh,&xl);
fixed_add(uh,ul,th,tl,&xh,&xl);
//HPLOT 32*U+140,32*V+96
hplot(48*u+140,48*fixed_to_float(vh,vl)+96);
}
}
grsim_update();
usleep(100000);
ch=grsim_input();
if (ch=='q') exit(0);
//t=t+(1.0/32.0);
// 1/2 1/4 1/8 1/16 | 1/32 1/64 1/128 1/256
if (tl>=0xf8) th=th+1;
tl=tl+0x08;
// printf("%x %x\n",th,tl);
}
return 0;
}