Merge pull request #629 from blackystardust/master

Added C128 accelerator code and documentation for both C128 mode and C128 in C64 mode.
This commit is contained in:
Oliver Schmidt 2018-04-25 15:08:11 +02:00 committed by GitHub
commit fc61bc79c5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 258 additions and 3 deletions

View File

@ -40,3 +40,10 @@ C64DTV_Extended_Regs := $D03F
C64DTV_Slow = $00
C64DTV_Fast = $03
; ---------------------------------------------------------------------------
; C128 in C64 mode
C128_VICIIE_CLK := $D030

View File

@ -94,9 +94,12 @@ The functions listed below are accelerator functions for the C128. See the <url
url="funcref.html" name="function reference"> for declaration and usage.
<itemize>
<item>detect_c128
<item>detect_scpu
<item>scpu_get_speed
<item>scpu_set_speed
<item>get_c128_speed
<item>get_scpu_speed
<item>set_c128_speed
<item>set_scpu_speed
</itemize>

View File

@ -175,10 +175,13 @@ The functions listed below are accelerator functions for the C64. See the <url
url="funcref.html" name="function reference"> for declaration and usage.
<itemize>
<item>detect_c128
<item>detect_c64dtv
<item>detect_scpu
<item>get_c128_speed
<item>get_c64dtv_speed
<item>get_scpu_speed
<item>set_c128_speed
<item>set_c64dtv_speed
<item>set_scpu_speed
</itemize>

View File

@ -68,10 +68,13 @@ function.
<sect1><tt/accelerator.h/<label id="accelerator.h"><p>
<itemize>
<item><ref id="detect_c128" name="detect_c128">
<item><ref id="detect_c64dtv" name="detect_c64dtv">
<item><ref id="detect_scpu" name="detect_scpu">
<item><ref id="get_c128_speed" name="get_c128_speed">
<item><ref id="get_c64dtv_speed" name="get_c64dtv_speed">
<item><ref id="get_scpu_speed" name="get_scpu_speed">
<item><ref id="set_c128_speed" name="set_c128_speed">
<item><ref id="set_c64dtv_speed" name="set_c64dtv_speed">
<item><ref id="set_scpu_speed" name="set_scpu_speed">
</itemize>
@ -2923,6 +2926,26 @@ used in presence of a prototype.
</quote>
<sect1>detect_c128<label id="detect_c128"><p>
<quote>
<descrip>
<tag/Function/Check if a C128 CPU is the current CPU.
<tag/Header/<tt/<ref id="accelerator.h" name="accelerator.h">/
<tag/Declaration/<tt/unsigned char detect_c128 (void);/
<tag/Description/The function returns a 1 if a C128 CPU is the current CPU.
<tag/Notes/<itemize>
<item>The function is specific to the C64 and C128.
</itemize>
<tag/Availability/cc65 (not all platforms)
<tag/See also/
<ref id="get_c128_speed" name="get_c128_speed">,
<ref id="set_c128_speed" name="set_c128_speed">,
<tag/Example/None.
</descrip>
</quote>
<sect1>detect_c64dtv<label id="detect_c64dtv"><p>
<quote>
@ -3502,6 +3525,28 @@ header files define constants that can be used to check the return code.
</quote>
<sect1>get_c128_speed<label id="get_c128_speed"><p>
<quote>
<descrip>
<tag/Function/Get the current speed of the C128 CPU.
<tag/Header/<tt/<ref id="accelerator.h" name="accelerator.h">/
<tag/Declaration/<tt/unsigned char get_c128_speed (void);/
<tag/Description/The function returns the current speed of the C128 CPU.
<tag/Notes/<itemize>
<item>The function is specific to the C64 and C128.
<item>The function does not check if the C128 CPU is the current CPU.
<item>See the accelerator.h header for the speed definitions.
</itemize>
<tag/Availability/cc65 (not all platforms)
<tag/See also/
<ref id="detect_c128" name="detect_c128">,
<ref id="set_c128_speed" name="set_c128_speed">,
<tag/Example/None.
</descrip>
</quote>
<sect1>get_c64dtv_speed<label id="get_c64dtv_speed"><p>
<quote>
@ -6097,6 +6142,28 @@ clean-up when exitting the program.
</quote>
<sect1>set_c128_speed<label id="set_c128_speed"><p>
<quote>
<descrip>
<tag/Function/Set the current speed of a C128 CPU.
<tag/Header/<tt/<ref id="accelerator.h" name="accelerator.h">/
<tag/Declaration/<tt/unsigned char __fastcall__ set_c128_speed (unsigned char speed);/
<tag/Description/The function returns the speed after trying to set the speed of the C128 CPU.
<tag/Notes/<itemize>
<item>The function is specific to the C64 and C128.
<item>The function does not check if the C128 CPU is the current CPU.
<item>See the accelerator.h header for the speed definitions.
</itemize>
<tag/Availability/cc65 (not all platforms)
<tag/See also/
<ref id="detect_c128" name="detect_c128">,
<ref id="get_c128_speed" name="get_c128_speed">,
<tag/Example/None.
</descrip>
</quote>
<sect1>set_c64dtv_speed<label id="set_c64dtv_speed"><p>
<quote>

View File

@ -136,5 +136,44 @@ extern unsigned char detect_c64dtv (void);
* 0x01 : C64DTV present
*/
/* C128 8502 CPU */
extern unsigned char __fastcall__ set_c128_speed (unsigned char speed);
/* Set the speed of the C128 8502 CPU, using SPEED_SLOW will switch to
* 1 Mhz (slow) mode, SPEED_2X or SPEED_FAST will switch to 2Mhz (fast) mode.
*
* Note that any value higher or equal to SPEED_2X will switch to fast mode.
*
* This function will return the actual speed the CPU is at after trying
* to set the requested speed, to my knowledge the switching should not fail.
*
* This function does not check if the C128 CPU is the current CPU, make sure
* you use 'detect_c128();' before using.
*/
extern unsigned char get_c128_speed (void);
/* Get the speed of the C128 8502 CPU.
*
* Possible return values:
* SPEED_SLOW : Slow mode
* SPEED_2X : Fast mode
*
* This function does not check if the C128 CPU is the current CPU, make sure
* you use 'detect_c128();' before using.
*/
extern unsigned char detect_c128 (void);
/* Check if the C128 CPU is the current CPU.
*
* Possible return values:
* 0x00 : C128 CPU is not the current CPU
* 0x01 : C128 CPU is the current CPU
*/
/* End of accelerator.h */
#endif

56
libsrc/c128/acc_c128_speed.s Executable file
View File

@ -0,0 +1,56 @@
;
; Marco van den Heuvel, 2018-04-23
;
; extern unsigned char __fastcall__ set_c128_speed (unsigned char speed);
;
;/* Set the speed of the C128 8502 CPU, using SPEED_SLOW will switch to
; * 1 Mhz (slow) mode, SPEED_2X or SPEED_FAST will switch to 2Mhz (fast) mode.
; *
; * Note that any value higher or equal to SPEED_2X will switch to fast mode.
; *
; * This function will return the actual speed the CPU is at after trying
; * to set the requested speed, to my knowledge the switching should not fail.
; *
; * For C64 programs a check for a C128 in C64 mode is needed, make sure you
; * use 'detect_c128();' before using.
; *
; * For C128 programs no detect function call is needed.
; */
; extern unsigned char get_c128_speed (void);
;
;/* Get the speed of the C128 8502 CPU.
; *
; * Possible return values:
; * SPEED_SLOW : Slow mode
; * SPEED_2X : Fast mode
; *
; * For C64 programs a check for a C128 in C64 mode is needed, make sure you
; * use 'detect_c128();' before using.
; *
; * For C128 programs no detect function call is needed.
; */
.export _set_c128_speed
.export _get_c128_speed
.include "accelerator.inc"
_set_c128_speed:
cmp #SPEED_2X
bcs high_speed
store_speed:
sta C128_VICIIE_CLK
.byte $2C ; skip over the lda #$01
high_speed:
lda #$01
bne store_speed
_get_c128_speed:
lda C128_VICIIE_CLK
and #$01
ldx #$00
rts

24
libsrc/c128/acc_detect_c128.s Executable file
View File

@ -0,0 +1,24 @@
;
; Marco van den Heuvel, 2018-04-23
;
; unsigned char detect_c128 (void);
;
;/* Check if the C128 8502 CPU is the current CPU.
; *
; * Possible return values:
; * 0x00 : C128 8502 is not the current CPU
; * 0x01 : C128 8502 is the current CPU
; */
.export _detect_c128
.include "accelerator.inc"
_detect_c128:
ldx #$00
lda #$01
; Make sure the CPU is a 8502
.byte $3A ; NOP on 8502, DEA on 65(S)C(E)02, 4510 and 65816
rts

6
libsrc/c64/acc_c128_speed.s Executable file
View File

@ -0,0 +1,6 @@
;
; Marco van den Heuvel, 2018-04-23
;
.include "../c128/acc_c128_speed.s"

36
libsrc/c64/acc_detect_c128.s Executable file
View File

@ -0,0 +1,36 @@
;
; Marco van den Heuvel, 2018-04-20
;
; unsigned char detect_c128 (void);
;
;/* Check for the presence of a C128 in C64 mode.
; *
; * Possible return values:
; * 0x00 : C128 in C64 mode not present
; * 0x01 : C128 in C64 mode present
; */
.export _detect_c128
.include "accelerator.inc"
_detect_c128:
lda #$00
tax
; Make sure the CPU is a 8502
.byte $1A ; NOP on 8502, INA on 65(S)C(E)02, 4510 and 65816
beq found
.byte $3A ; decrement A again, so a #$00 can be returned
rts
found:
; Make sure a C128 VICIIe is present
ldy C128_VICIIE_CLK
cpy #$FF
beq not_found
lda #$01
not_found:
rts

View File

@ -1,6 +1,7 @@
CL ?= cl65
all: c64-scpu-test.prg c128-scpu-test.prg c64dtv-test.prg
all: c64-scpu-test.prg c128-scpu-test.prg c64dtv-test.prg \
c64-c128-test.prg c128-test.prg
c64-scpu-test.prg: c64-c128-scpu-test.c
$(CL) -t c64 c64-c128-scpu-test.c -o c64-scpu-test.prg
@ -11,3 +12,8 @@ c128-scpu-test.prg: c64-c128-scpu-test.c
c64dtv-test.prg: c64dtv-test.c
$(CL) -t c64 c64dtv-test.c -o c64dtv-test.prg
c64-c128-test.prg: c64-c128-test.c
$(CL) -t c64 c64-c128-test.c -o c64-c128-test.prg
c128-test.prg: c64-c128-test.c
$(CL) -t c128 c64-c128-test.c -o c128-test.prg

View File

@ -0,0 +1,8 @@
/* C128 in C64 mode accelerator test code. */
#define ACC_DETECT detect_c128
#define ACC_GET_SPEED get_c128_speed
#define ACC_SET_SPEED set_c128_speed
#define ACC_NAME "C128 CPU"
#include "turbo-test.c"