the10thwiz/cc65
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Changes due to code review.

Browse Source
This commit is contained in:
IrgendwerA8
2019-03-21 20:43:07 +01:00
committed by Oliver Schmidt
parent 399250a105
commit db8bd84a82
12 changed files with 39 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
doc/specialmath.sgml
View File

@@ -20,7 +20,7 @@ the target address. A quite common horizontal span for 8-bit systems is 20 or 40
<p> <p>
<tscreen><verb> <tscreen><verb>
unsigned int __fastcall__ mul20(unsigned char value); unsigned int __fastcall__ _mul20(unsigned char value);
</verb></tscreen> </verb></tscreen>
The 8 bit <tt>value</tt> is multiplied by 20 and returned as 16 bit value. The 8 bit <tt>value</tt> is multiplied by 20 and returned as 16 bit value.
@@ -28,7 +28,7 @@ The 8 bit <tt>value</tt> is multiplied by 20 and returned as 16 bit value.
<p> <p>
<tscreen><verb> <tscreen><verb>
unsigned int __fastcall__ mul40(unsigned char value); unsigned int __fastcall__ _mul40(unsigned char value);
</verb></tscreen> </verb></tscreen>
The 8 bit <tt>value</tt> is multiplied by 40 and returned as 16 bit value. The 8 bit <tt>value</tt> is multiplied by 40 and returned as 16 bit value.

4
include/specialmath.h
View File

@@ -33,12 +33,12 @@
/* Multiply an 8 bit unsigned value by 20 and return the 16 bit unsigned result */ /* Multiply an 8 bit unsigned value by 20 and return the 16 bit unsigned result */
unsigned int __fastcall__ mul20(unsigned char value); unsigned int __fastcall__ _mul20(unsigned char value);
/* Multiply an 8 bit unsigned value by 40 and return the 16 bit unsigned result */ /* Multiply an 8 bit unsigned value by 40 and return the 16 bit unsigned result */
unsigned int __fastcall__ mul40(unsigned char value); unsigned int __fastcall__ _mul40(unsigned char value);

1
libsrc/Makefile
View File

@@ -181,7 +181,6 @@ SRCDIRS += common \
mouse \ mouse \
runtime \ runtime \
serial \ serial \
specialmath \
tgi \ tgi \
zlib zlib

4
libsrc/atari/cputc.s
View File

@@ -7,7 +7,7 @@
.export _cputcxy, _cputc .export _cputcxy, _cputc
.export plot, cputdirect, putchar .export plot, cputdirect, putchar
.import gotoxy, _mul40 .import gotoxy, __mul40
.importzp tmp4,ptr4 .importzp tmp4,ptr4
.import _revflag,setcursor .import _revflag,setcursor
@@ -71,7 +71,7 @@ putchar:
sta (OLDADR),y sta (OLDADR),y
lda ROWCRS lda ROWCRS
jsr _mul40 ; destroys tmp4, carry is cleared jsr __mul40 ; destroys tmp4, carry is cleared
adc SAVMSC ; add start of screen memory adc SAVMSC ; add start of screen memory
sta ptr4 sta ptr4
txa txa

4
libsrc/atari/mcbtxtchar.s
View File

@@ -12,7 +12,7 @@
.export _mouse_txt_callbacks .export _mouse_txt_callbacks
.importzp tmp4 .importzp tmp4
.import _mul40 .import __mul40
.importzp mouse_txt_char ; screen code of mouse cursor .importzp mouse_txt_char ; screen code of mouse cursor
.include "atari.inc" .include "atari.inc"
@@ -108,7 +108,7 @@ movey:
lsr a ; convert y position to character line lsr a ; convert y position to character line
lsr a lsr a
lsr a lsr a
jsr _mul40 ; carry is cleared by _mul40 jsr __mul40 ; carry is cleared by _mul40
adc SAVMSC adc SAVMSC
sta scrptr sta scrptr
txa txa

6
libsrc/atari/scroll.s
View File

@@ -8,7 +8,7 @@
.include "atari.inc" .include "atari.inc"
.importzp tmp1,tmp4,ptr1,ptr2 .importzp tmp1,tmp4,ptr1,ptr2
.import _mul40,_clrscr .import __mul40,_clrscr
.export __scroll .export __scroll
.proc __scroll .proc __scroll
@@ -40,7 +40,7 @@ down_ok:lda SAVMSC
sta ptr2+1 sta ptr2+1
lda tmp1 lda tmp1
jsr _mul40 jsr __mul40
sta tmp4 sta tmp4
lda ptr2 lda ptr2
sec sec
@@ -103,7 +103,7 @@ up: sta tmp1 ; # of lines to scroll
jmp _clrscr jmp _clrscr
;multiply by 40 (xsize) ;multiply by 40 (xsize)
up_ok: jsr _mul40 ; carry is cleared by _mul40 up_ok: jsr __mul40 ; carry is cleared by __mul40
adc SAVMSC ; add start of screen mem adc SAVMSC ; add start of screen mem
sta ptr2 sta ptr2
txa txa

4
libsrc/atari/setcursor.s
View File

@@ -4,7 +4,7 @@
; cursor handling, internal function ; cursor handling, internal function
.include "atari.inc" .include "atari.inc"
.import cursor,_mul40 .import cursor,__mul40
.export setcursor .export setcursor
.proc setcursor .proc setcursor
@@ -14,7 +14,7 @@
sta (OLDADR),y sta (OLDADR),y
lda ROWCRS lda ROWCRS
jsr _mul40 ; function leaves with carry clear! jsr __mul40 ; function leaves with carry clear!
adc SAVMSC ; add start of screen memory adc SAVMSC ; add start of screen memory
sta OLDADR sta OLDADR
txa txa

4
libsrc/atari5200/cputc.s
View File

@@ -10,7 +10,7 @@
.export _cputcxy, _cputc .export _cputcxy, _cputc
.export plot, cputdirect, putchar .export plot, cputdirect, putchar
.import gotoxy, _mul20 .import gotoxy, __mul20
.importzp ptr4 .importzp ptr4
.import setcursor .import setcursor
@@ -75,7 +75,7 @@ putchar:
pha ; save char pha ; save char
lda ROWCRS_5200 lda ROWCRS_5200
jsr _mul20 ; destroys tmp4, carry is cleared jsr __mul20 ; destroys tmp4, carry is cleared
adc SAVMSC ; add start of screen memory adc SAVMSC ; add start of screen memory
sta ptr4 sta ptr4
txa txa

6
libsrc/specialmath/mul20.s → libsrc/common/_mul20.s
View File

@@ -8,15 +8,15 @@
; See "LICENSE" file for legal information. ; See "LICENSE" file for legal information.
; ;
; ;
; unsigned int __fastcall__ mul20(unsigned char value); ; unsigned int __fastcall__ _mul20(unsigned char value);
; ;
; REMARKS: Function is defined to return with carry-flag cleared ; REMARKS: Function is defined to return with carry-flag cleared
.importzp tmp4 .importzp tmp4
.export _mul20 .export __mul20
.proc _mul20 ; = 30 bytes, 41/46 cycles .proc __mul20 ; = 30 bytes, 41/46 cycles
sta tmp4 ; remember value for later addition... sta tmp4 ; remember value for later addition...
ldx #0 ; clear high-byte ldx #0 ; clear high-byte

6
libsrc/specialmath/mul40.s → libsrc/common/_mul40.s
View File

@@ -8,15 +8,15 @@
; See "LICENSE" file for legal information. ; See "LICENSE" file for legal information.
; ;
; ;
; unsigned int __fastcall__ mul40(unsigned char value); ; unsigned int __fastcall__ _mul40(unsigned char value);
; ;
; REMARKS: Function is defined to return with carry-flag cleared ; REMARKS: Function is defined to return with carry-flag cleared
.importzp tmp4 .importzp tmp4
.export _mul40 .export __mul40
.proc _mul40 ; = 33 bytes, 48/53 cycles .proc __mul40 ; = 33 bytes, 48/53 cycles
sta tmp4 ; remember value for later addition... sta tmp4 ; remember value for later addition...
ldx #0 ; clear high-byte ldx #0 ; clear high-byte

18
test/val/lib_common_mulxx.c Normal file
View File

@@ -0,0 +1,18 @@
#include <specialmath.h>
#include "unittest.h"
TEST
{
unsigned i;
for (i=0; i < 256; ++i)
{
ASSERT_AreEqual(i*20, _mul20(i), "%u", "Invalid 'mul20(%u)' calculation!" COMMA i);
}
for (i=0; i < 256; ++i)
{
ASSERT_AreEqual(i*40, _mul40(i), "%u", "Invalid 'mul40(%u)' calculation!" COMMA i);
}
}
ENDTEST

18
test/val/lib_specialmath_mulxx.c
View File

@@ -1,18 +0,0 @@
#include <specialmath.h>
#include "unittest.h"
TEST
{
unsigned i;
for (i=0; i < 256; ++i)
{
ASSERT_AreEqual(i*20, mul20(i), "%u", "Invalid 'mul20(%u)' calculation!" COMMA i);
}
for (i=0; i < 256; ++i)
{
ASSERT_AreEqual(i*40, mul40(i), "%u", "Invalid 'mul40(%u)' calculation!" COMMA i);
}
}
ENDTEST