6502/cc65
1
0
Fork 0
mirror of https://github.com/cc65/cc65.git synced 2024-12-23 04:30:10 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2517 from kugelfuhr/kugelfuhr/time-improvements

Browse Source 
Improved/fixed the time() function
This commit is contained in:
Bob Andrews 2024-09-13 17:47:14 +02:00 committed by GitHub
commit 34d8c3ef0a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 84 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
libsrc/common/time.s
View File

@ -22,55 +22,50 @@
; Get the time (machine dependent)
.assert timespec::tv_sec = 0, error
lda #CLOCK_REALTIME
jsr pusha
lda #<time
ldx #>time
jsr _clock_gettime
sta tmp2
lda #<time
ldx #>time
.assert timespec::tv_sec = 0, error
jsr ldeaxi
sta tmp1 ; Save low byte of result
; _clock_gettime returns 0 on success and -1 on error. Check that.
inx ; Did _clock_gettime return -1?
bne @L2 ; Jump if not
; We had an error so invalidate time. A contains $FF.
ldy #3
@L1: sta time,y
dey
bpl @L1
; Restore timep and check if it is NULL
pla
@L2: pla
sta ptr1+1
pla
sta ptr1 ; Restore timep
ora ptr1+1 ; timep == 0?
beq @L1
beq @L4
; timep is not NULL, store the result there
ldy #3
lda sreg+1
@L3: lda time,y
sta (ptr1),y
dey
lda sreg
sta (ptr1),y
dey
txa
sta (ptr1),y
dey
lda tmp1
sta (ptr1),y
bpl @L3
; If the result is != 0, return -1
; Load the final result.
@L1: lda tmp2
beq @L2
tax
sta sreg
@L4: lda time+3
sta sreg+1
rts
; Reload the low byte of the result and return
@L2: lda tmp1
lda time+2
sta sreg
ldx time+1
lda time
rts
.endproc

61
test/val/time-test2.c Normal file
View File

@ -0,0 +1,61 @@
/* Another test for time() */
#include <stdio.h>
#include <time.h>
static int failures = 0;
#define INV_TIME ((time_t)-1)
#define TEST_TIME ((time_t)0x78AB1234)
/* We supply our own clock_gettime function so we can control the values
** supplied to time() internally.
*/
static time_t timeval;
static int timeres;
int __fastcall__ clock_gettime (clockid_t, struct timespec *tp)
{
/* Don't touch tp in case of an error */
if (timeres != -1) {
tp->tv_sec = timeval;
tp->tv_nsec = 0;
}
return timeres;
}
int main()
{
time_t res, pres;
/* First test: Force time() to return an error. Check that both, the
** returned value and the value passed via pointer are (time_t)-1.
*/
timeval = 42;
timeres = -1;
res = time(&pres);
if (res != INV_TIME || pres != INV_TIME) {
printf("Error in test 1\n");
++failures;
}
/* Second test: Return a valid value and check both results */
timeval = TEST_TIME;
timeres = 0;
res = time(&pres);
if (res != TEST_TIME || pres != TEST_TIME) {
printf("Error in test 2\n");
++failures;
}
/* Third test: Return no error but an invalid value and check both
** results
*/
timeval = INV_TIME;
timeres = 0;
res = time(&pres);
if (res != INV_TIME || pres != INV_TIME) {
printf("Error in test 3\n");
++failures;
}
return failures;
}