From f70020a2b8b5bf03ddad690191a02eab4697d758 Mon Sep 17 00:00:00 2001 From: mrdudz Date: Sun, 28 Aug 2022 20:18:34 +0200 Subject: [PATCH] use __sig_ign and __sig_dft instead of _sig_ign and _sig_dft --- asminc/signal.inc | 4 ++-- include/signal.h | 8 ++++---- libsrc/common/raise.s | 4 ++-- libsrc/common/signal.s | 4 ++-- libsrc/common/sigtable.s | 12 ++++++------ 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/asminc/signal.inc b/asminc/signal.inc index ebde07e42..597cad413 100644 --- a/asminc/signal.inc +++ b/asminc/signal.inc @@ -49,8 +49,8 @@ SIGCOUNT = 6 ; Number of signals .global sigtable ; Function declarations -.global __sig_ign -.global __sig_dfl +.global ___sig_ign +.global ___sig_dfl .global _signal .global _raise diff --git a/include/signal.h b/include/signal.h index 0d5f6ad09..d67cebf7c 100644 --- a/include/signal.h +++ b/include/signal.h @@ -45,12 +45,12 @@ typedef unsigned char sig_atomic_t; typedef void __fastcall__ (*__sigfunc) (int); /* Functions that implement SIG_IGN and SIG_DFL */ -void __fastcall__ _sig_ign (int); -void __fastcall__ _sig_dfl (int); +void __fastcall__ __sig_ign (int); +void __fastcall__ __sig_dfl (int); /* Standard signal handling functions */ -#define SIG_DFL _sig_dfl -#define SIG_IGN _sig_ign +#define SIG_DFL __sig_dfl +#define SIG_IGN __sig_ign #define SIG_ERR ((__sigfunc) 0x0000) /* Signal numbers */ diff --git a/libsrc/common/raise.s b/libsrc/common/raise.s index 07898ef90..205bbd471 100644 --- a/libsrc/common/raise.s +++ b/libsrc/common/raise.s @@ -33,9 +33,9 @@ _raise: ; introduce race conditions, but it's the simplest way to satisfy the ; standard). - lda #<__sig_dfl + lda #<___sig_dfl sta sigtable,x - lda #>__sig_dfl + lda #>___sig_dfl sta sigtable+1,x ; Restore the signal number and call the function diff --git a/libsrc/common/signal.s b/libsrc/common/signal.s index 333072801..40262c457 100644 --- a/libsrc/common/signal.s +++ b/libsrc/common/signal.s @@ -54,7 +54,7 @@ _signal: pla tax pla -__sig_ign: +___sig_ign: rts ; Error entry: We use our knowledge that SIG_ERR is zero here to save a byte @@ -63,6 +63,6 @@ invalidsig: lda #