Skip to content

GitLab

Open
Created by Ben Avison@bavisonDeveloper
Report abuse

Facilitate cross compilation, and simplify own makefile

All threads resolved
Compare
and
6 files
+ 191
- 165
b‎as‎
Squ‎ish‎ +155 -120
!MkCle‎an,fd7‎ +1 -0
.giti‎gnore‎ +5 -0
.gitlab‎-ci.yml‎ +24 -0
Ke‎ep‎ +2 -0
Make‎file‎ +4 -45
bas/Squish
+ 155
- 120
Show all unchanged lines Show 20 lines
REM See the License for the specific language governing permissions and
REM limitations under the License.
REM
brandy%=INSTR(REPORT$,"Brandy")
ON ERROR REPORT:PRINT " (internal error ";ERL;")":END
ver$="v1.16 28-Mar-19"
DIM code% 1000
PROCinit_tokens
bufsize%=HIMEM-END-&8000
DIM buf% bufsize%
defaultalloc%=3:REM bytes to reserve for new name when building list
FOR A=0 TO 2 STEP 2
P%=code%
[ OPT A
; call BASIC internal routine tokenaddr
; R0=token, [nxt] nextbyte
.gettoken
STMFD R13!,{R14}
ADD R2,R14,#19*4 ; tokenaddr
ADR R14,back
ADR R12,nxt
MOV PC,R2
.back
STR R1,tst
LDMFD R13!,{PC}
.tst EQUD 0 ; tokenaddr result
.nxt EQUD 0 ; Fake LINE buffer used by tokenaddr
; Identifiers are stored in a linked list in the following format:
; bytes 0-3 = address of next identifier, 0 for none
; byte 4 = usage count
; bytes 5+ = identifier name, CR-terminated
.asm_add_identifier
.asm_add_identifier_ident_loop
STR R0,adr
ADR R2,searchbuf
ADD R1,R0,#5 ; -> firstchar
.asm_add_identifier_char_loop
LDRB R3,[R2],#1
LDRB R4,[R1],#1
TEQ R3,R4
BNE asm_add_identifier_next_ident
TEQ R3,#13
BNE asm_add_identifier_char_loop
; Match found, increase usage count
LDRB R3,[R0,#4]
ADD R3,R3,#1
TEQ R3,#256
STRNEB R3,[R0,#4]
STR R0,fadr
MOV R3,#1
STR R3,adr
MOV PC,R14
; Not found
.asm_add_identifier_next_ident
LDR R0,[R0]
TEQ R0,#0
BNE asm_add_identifier_ident_loop
MOV PC,R14
.searchbuf EQUS STRING$(206,"*") ; buffer to store string to match
ALIGN
EQUD 0
.adr EQUD 0 ; address of found identifier, or where to store link to new identifier
.fadr EQUD -1 ; 1 = identifier found, 0 = identifier not found
]
NEXT A
DIM searchbuf 206
$searchbuf=STRING$(206,"*")
DIM adr 4
DIM fadr 4
warnlvl%=1
listlvl%=-1
Show 20 lines Show all unchanged lines Show 20 lines
fa%=FALSE
m$=""
j$=""
savepath%=TRUE
PROCprocess_args(F$,f$)
IF F$="" INPUT "Input file: "F$
IF f$="" INPUT "Output file: "f$
Show 20 lines Show all unchanged lines Show 20 lines
UNTIL pt%=ll%
=T$
DEF PROCtoken(A$)
A%=ASC A$
?nxt=ASC RIGHT$(A$,1)
CALLgettoken
N%=!tst
i$=""
WHILE ?N%<127 AND ?N%>31
i$+=CHR$ ?N%
N%+=1
ENDWHILE
IF A$=CHR$ 184+"P":i$+="P"
PROClog_str(i$)
DEF PROCinit_tokens
DIM token$(3,255)
LOCAL type%,token%,name$
FOR type%=0 TO 3
READ token%
REPEAT
READ name$
IF name$<>"" THEN
token$(type%,token%)=name$
token%+=1
ENDIF
UNTIL name$=""
NEXT type%
ENDPROC
DEF PROCtok(A%)
CALLgettoken
N%=!tst
ENDWHILE
ENDPROC
REM One-byte tokens
DATA &7F, "OTHERWISE"
DATA "AND", "DIV", "EOR", "MOD"
DATA "OR", "ERROR", "LINE", "OFF"
DATA "STEP", "SPC", "TAB(", "ELSE"
DATA "THEN", " unlistable token ", "OPENIN", "PTR"
DATA "PAGE", "TIME", "LOMEM", "HIMEM"
DATA "ABS", "ACS", "ADVAL", "ASC"
DATA "ASN", "ATN", "BGET", "COS"
DATA "COUNT", "DEG", "ERL", "ERR"
DATA "EVAL", "EXP", "EXT", "FALSE"
DATA "FN", "GET", "INKEY", "INSTR("
DATA "INT", "LEN", "LN", "LOG"
DATA "NOT", "OPENUP", "OPENOUT", "PI"
DATA "POINT(", "POS", "RAD", "RND"
DATA "SGN", "SIN", "SQR", "TAN"
DATA "TO", "TRUE", "USR", "VAL"
DATA "VPOS", "CHR$", "GET$", "INKEY$"
DATA "LEFT$(", "MID$(", "RIGHT$(", "STR$"
DATA "STRING$(", "EOF", " unlistable token ", " unlistable token "
DATA " unlistable token ", "WHEN", "OF", "ENDCASE"
DATA "ELSE", "ENDIF", "ENDWHILE", "PTR"
DATA "PAGE", "TIME", "LOMEM", "HIMEM"
DATA "SOUND", "BPUT", "CALL", "CHAIN"
DATA "CLEAR", "CLOSE", "CLG", "CLS"
DATA "DATA", "DEF", "DIM", "DRAW"
DATA "END", "ENDPROC", "ENVELOPE", "FOR"
DATA "GOSUB", "GOTO", "GCOL", "IF"
DATA "INPUT", "LET", "LOCAL", "MODE"
DATA "MOVE", "NEXT", "ON", "VDU"
DATA "PLOT", "PRINT", "PROC", "READ"
DATA "REM", "REPEAT", "REPORT", "RESTORE"
DATA "RETURN", "RUN", "STOP", "COLOUR"
DATA "TRACE", "UNTIL", "WIDTH", "OSCLI"
DATA ""
DEF PROCextok(A%,?nxt)
CALLgettoken
N%=!tst
i$=""
WHILE ?N%<127 AND ?N%>31
i$+=CHR$ ?N%
N%+=1
ENDWHILE
REM Two-byte function tokens
DATA &8E, "SUM", "BEAT"
DATA ""
REM Two-byte command tokens
DATA &8E, "APPEND", "AUTO"
DATA "CRUNCH", "DELETE", "EDIT", "HELP"
DATA "LIST", "LOAD", "LVAR", "NEW"
DATA "OLD", "RENUMBER", "SAVE", "TEXTLOAD"
DATA "TEXTSAVE", "TWIN", "TWINO", "INSTALL"
DATA ""
REM Two-byte statement tokens
DATA &8E, "CASE", "CIRCLE"
DATA "FILL", "ORIGIN", "POINT", "RECTANGLE"
DATA "SWAP", "WHILE", "WAIT", "MOUSE"
DATA "QUIT", "SYS", "INSTALL", "LIBRARY"
DATA "TINT", "ELLIPSE", "BEATS", "TEMPO"
DATA "VOICES", "VOICE", "STEREO", "OVERLAY"
DATA ""
DEF PROCtoken(A$)
A%=ASC A$
IF A%>=&C6 AND A%<=&C8 THEN
i$=token$(A%-&C5,ASC RIGHT$(A$,1))
ELSE
i$=token$(0,A%)
IF A$=CHR$ 184+"P":i$+="P"
ENDIF
PROClog_str(i$)
ENDPROC
Show 20 lines Show all unchanged lines Show 20 lines
linebase%=0
newbase%=heapptr%+16
newptr%=newbase%
PROCstart_next_line
PROCwrite(CHR$ 244+">"+f$)
PROClog_str("REM>"+f$)
IF savepath% THEN
PROCstart_next_line
PROCwrite(CHR$ 244+">"+f$)
PROClog_str("REM>"+f$)
ENDIF
PROCstart_next_line
pt%=buf%
asmflag%=0
Show 20 lines Show all unchanged lines Show 20 lines
ELSE
PROClog_str(got$)
PROCwrite(got$)
IF quoteflag% AND got$<>"""" AND literal% BPUT #literal%,got$;
IF quoteflag% AND got$<>"""" AND literal% BPUT#literal%,got$;
ENDIF
IF got$="""" THEN
quoteflag%=NOT quoteflag%
IF NOT quoteflag% THEN
IF literal% AND da%<>PTR #literal% BPUT #literal%,10
user avatar user avatar user avatar
IF literal% THEN
IF da%<>PTR#literal% BPUT#literal%,10
ENDIF
IF sys% AND m% THEN
y%=FNresolve_swi_name(h$,pa%)
IF NOT y% THEN
Show 20 lines Show all unchanged lines Show 20 lines
PROCwrite(FNi)
ELSE
IF m% h$=""
IF literal% da%=PTR #literal%
IF literal% da%=PTR#literal%
ENDIF
ENDIF
WHEN 11
Show 20 lines Show all unchanged lines Show 20 lines
SYS "OS_File",0,f$,load%,exec%,newbase%,linebase%+2
ENDPROC
DEF FNcall_add_identifier(A%)
REPEAT
!adr=A%
IF $searchbuf=$(A%+5) THEN
IF A%?4 < 255 THEN A%?4 = A%?4 + 1
!fadr = A%
!adr = 1
=A%
ENDIF
A%=!A%
UNTIL A%=0
=0
DEF FNnewvar($searchbuf,A%)
LOCAL d$,e%
IF USR asm_add_identifier=0 THEN
IF FNcall_add_identifier(A%)=0 THEN
d$=$searchbuf
ELSE
d$=j$+$(!fadr+6+LEN ($(!fadr+5)))
Show 20 lines Show all unchanged lines Show 20 lines
=heapptr%-s%
DEF FNadd_identifier($searchbuf,A%)
CALL asm_add_identifier
IFFNcall_add_identifier(A%)
ta%=!adr
IF ta%=1:=0
u%=FNalloc(LEN ($searchbuf)+defaultalloc%+7)
Show 20 lines Show all unchanged lines Show 20 lines
to$=""
list$=""
sysfrom$="CLib:h.swis":REM Default unless overridden
SYS "OS_GetEnv" TO e$
WHILE RIGHT$(e$,1)=" "
e$=LEFT$(e$,LEN (e$)-1)
ENDWHILE
WHILE e$<>"" AND w%<=20
WHILE LEFT$(e$,1)=" "
e$=MID$(e$,2)
ENDWHILE
IF e$<>"" THEN
p%=INSTR(e$," ")
IF p%=0 THEN p%=1+LEN (e$)
a$(w%)=LEFT$(e$,p%-1)
e$=MID$(e$,p%+1)
IF brandy% THEN
w%=0
WHILE w%<=20 AND w%<=ARGC
a$(w%)=ARGV$(w%):REM array assignment from ARGV$() appears to be unsupported
w%+=1
ENDIF
ENDWHILE
ENDWHILE
ELSE
SYS "OS_GetEnv" TO e$
WHILE RIGHT$(e$,1)=" "
e$=LEFT$(e$,LEN (e$)-1)
ENDWHILE
WHILE e$<>"" AND w%<=20
WHILE LEFT$(e$,1)=" "
e$=MID$(e$,2)
ENDWHILE
IF e$<>"" THEN
p%=INSTR(e$," ")
IF p%=0 THEN p%=1+LEN (e$)
a$(w%)=LEFT$(e$,p%-1)
e$=MID$(e$,p%+1)
w%+=1
ENDIF
ENDWHILE
ENDIF
p%=0
WHILE p%<w%
CASE FNtoupper(a$(p%)) OF
Show 20 lines Show all unchanged lines Show 20 lines
PRINT "Squish ("+ver$+")"'
PRINT "Syntax: *Squish -from <file> -to <file> [-warn <level>] [-literal <file>]"
PRINT " [-list <file> | -nolist] [-colour] [-nosys] [-sysfrom <file>]"
PRINT " [-nosavepath]"
END
WHEN "-FROM"
IF p%<w%-1 THEN
Show 20 lines Show all unchanged lines Show 20 lines
j$=a$(p%+1)
p%+=1
ENDIF
WHEN "-NOSAVEPATH"
savepath%=FALSE
ENDCASE
p%+=1
ENDWHILE
Show 20 lines Show all unchanged lines Show 20 lines
IF fa% THEN
y%=OPENIN (m$)
IF y%<>0 THEN
WHILE NOT EOF #y%
IF GET$ #y%=x$ THEN
CLOSE #y%
WHILE NOT EOF#y%
IF GET$#y%=x$ THEN
CLOSE#y%
=TRUE
ENDIF
ENDWHILE
CLOSE #y%
CLOSE#y%
ENDIF
ENDIF
=FALSE
Show 20 lines Show all unchanged lines Show 20 lines
WHEN listlvl%<0
PRINT (k$);
WHEN listlvl%>0
BPUT #listlvl%,k$;
BPUT#listlvl%,k$;
ENDCASE
logpos%+=LEN (k$)
IF logpos%>70 PROClog_nl
Show 20 lines Show all unchanged lines Show 20 lines
WHEN listlvl%<0
PRINT
WHEN listlvl%>0
BPUT #listlvl%,CHR$ 10;
BPUT#listlvl%,CHR$ 10;
ENDCASE
logpos%=0
ENDPROC
Show 20 lines Show all unchanged lines Show 20 lines
ENDPROC
DEF PROCtidyup
IF listlvl%>0 CLOSE #listlvl%:listlvl%=0
IF literal% CLOSE #literal%:literal%=0:SYS "OS_File",18,lit$,&FFF
IF listlvl%>0 CLOSE#listlvl%:listlvl%=0
user avatar user avatar
IF literal% CLOSE#literal%:literal%=0:SYS "OS_File",18,lit$,&FFF
ENDPROC
DEF PROCknockoutkept(e%,pre$,post$):REM removes single-char keep names from list
Show 20 lines Show all unchanged lines Show 20 lines
syslist%=0
y%=OPENIN (sysfrom$)
IF y%<>0 THEN
WHILE NOT EOF #y%
line$=GET$ #y%
WHILE NOT EOF#y%
line$=GET$#y%
name$="":value$=""
IF LEFT$(line$,8)="#define " THEN
line$=MID$(line$,9)
Show 20 lines Show all unchanged lines Show 20 lines
REM Names mustn't start with X or underscore, must include an underscore
IF LEFT$(name$,1)<>"X" AND INSTR(name$,"_") >= 2 THEN
IF FNtoupper(LEFT$(value$,2))="0X" THEN value$="&"+MID$(value$,3)
SYS"XOS_ReadUnsigned",10,value$ TO,,c%;f%
IF brandy% THEN
f%=0
LOCAL ERROR
ON ERROR LOCAL f%=1
IF f%=0 c%=EVAL(value$)
RESTORE ERROR
ELSE
SYS"XOS_ReadUnsigned",10,value$ TO,,c%;f%
ENDIF
REM And the value must be in 24 bit SWI range
IF ((f% AND 1)=0) AND ((c% AND &FF000000)=0) THEN
slot%=FNalloc(4+4+LEN(name$)+1)
Show 20 lines Show all unchanged lines Show 20 lines
ENDIF
ENDIF
ENDWHILE
CLOSE #y%
CLOSE#y%
ENDIF
=syslist%<>0
Show 20 lines Show all unchanged lines
!MkClean,fd7
+ 1
- 0
Show all unchanged lines Show 20 lines
|
Dir <Obey$Dir>
amu_machine clean
stripdepnd
.gitignore
+ 5
- 0
/Squish,ffb
/crunched/
/Makefile.d
/o/
/objs/
.gitlab-ci.yml
+ 24
- 0
include:
- project: 'Support/CI'
file: '/Squish.yml'
deploy_to_library:
stage: deploy
only:
refs: [ master ]
tags: [ cross ]
script:
# Depending on whether the pipeline is launched by the merge request or
# manually, VersionNum may or may not have been updated. Switch to the
# tip of master to ensure consistency.
- git checkout origin/master
- SOURCETAG=$(git describe --abbrev=8 --tags --always)
- BRANCH=Import$(echo $SOURCETAG | sed -e 's/[-._]//g')
- 'curl --location --output ~/cache/common/BuildHost.zip -z ~/cache/common/BuildHost.zip "https://gitlab.riscosopen.org/Products/BuildHost/-/jobs/artifacts/master/download?job=latest_package_tree"'
- unzip -q ~/cache/common/BuildHost.zip
- '[ ! -e BuildInfo ] || cat BuildInfo'
- source RiscOS/Env/ROOL/BuildHost.sh
- git clone https://$USER:$PASSWORD@gitlab.riscosopen.org/$USER/Library.git
- INSTDIR=../Library/Build mk install
# If the installed binary has changed in any way, raise a merge request
- cd Library && git diff --quiet --exit-code || ( git checkout -b $BRANCH; git add .; git commit -m "Update Squish from tag $SOURCETAG"; git push -o merge_request.create -o merge_request.target=RiscOS/Library/master origin $BRANCH )
bas/Keep → Keep
+ 2
- 0
Show all unchanged lines Show 20 lines
H%
P%
@%
ARGC
ARGV$()