Menu
▾
▴
ro-oslib-commits — list to notify of all commits to OSLib
You can subscribe to this list here.
| 2002 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(39) |
Dec
(23) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2003 |
Jan
(4) |
Feb
(8) |
Mar
|
Apr
|
May
|
Jun
(25) |
Jul
(2) |
Aug
(3) |
Sep
(9) |
Oct
|
Nov
(2) |
Dec
(21) |
| 2004 |
Jan
(57) |
Feb
|
Mar
|
Apr
|
May
(49) |
Jun
|
Jul
(8) |
Aug
(5) |
Sep
(2) |
Oct
(2) |
Nov
(2) |
Dec
|
| 2005 |
Jan
(2) |
Feb
|
Mar
(12) |
Apr
|
May
(5) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(17) |
| 2006 |
Jan
(5) |
Feb
(1) |
Mar
|
Apr
|
May
|
Jun
(3) |
Jul
(4) |
Aug
(5) |
Sep
|
Oct
|
Nov
|
Dec
|
| 2007 |
Jan
(3) |
Feb
|
Mar
|
Apr
(18) |
May
(13) |
Jun
(17) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(4) |
Dec
|
|
From: Tony v. d. H. <to...@us...> - 2004-05-03 15:04:18
|
Update of /cvsroot/ro-oslib/OSLib/!OsLib/OSLibSupport/Message_ In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13995/!OsLib/OSLibSupport/Message_ Modified Files: .cvsignore Added Files: AMUmakefile GNUmakefile Make,fd7 Modules Removed Files: !Clean,fd7 !Make,fd7 Makefile,fe1 Log Message: merged Unix-Build back into trunk (20040503-1) Index: .cvsignore =================================================================== RCS file: /cvsroot/ro-oslib/OSLib/!OsLib/OSLibSupport/Message_/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** .cvsignore 27 Nov 2002 22:10:57 -0000 1.3 --- .cvsignore 3 May 2004 15:03:25 -0000 1.4 *************** *** 1,4 **** --- 1,5 ---- *.o *.o,* + *.o32 o o32 --- NEW FILE: AMUmakefile --- # OSLibSupport.Message_.GNUmakefile # build OSLibSupport.Message_ under RISC OS #------------------------------------------------------ TARGET = Message #------------------------------------------------------ include ^.AMUmakefile/source --- !Make,fd7 DELETED --- --- !Clean,fd7 DELETED --- --- NEW FILE: Make,fd7 --- echo <sys$time> AMU -f <Obey$Dir>.AMUmakefile -desktop %0 echo <sys$time> --- Makefile,fe1 DELETED --- --- NEW FILE: GNUmakefile --- # OSLibSupport/Message_/GNUmakefile # build OSLibSupport/Message_ under UNIX #------------------------------------------------------ TARGET = Message #------------------------------------------------------ include ../GNUmakefile.source --- NEW FILE: Modules --- # OSLibSupport/Message_/Modules #------------------------------------------------------ TARGET := Message DIR := Message_ MESSAGE_TARGET := ${TARGET} MESSAGE_DIR := ${DIR} GNUMODULES += $(addsuffix .o, $(addprefix ${MESSAGE_DIR}/, ${MESSAGE_TARGET})) GNUMODULES32 += $(addsuffix .o32, $(addprefix ${MESSAGE_DIR}/, ${MESSAGE_TARGET})) AMUMODULES += $(addprefix ${MESSAGE_DIR}.o., ${MESSAGE_TARGET}) AMUMODULES32 += $(addprefix ${MESSAGE_DIR}.o32., ${MESSAGE_TARGET}) #------------------------------------------------------ |
|
From: Tony v. d. H. <to...@us...> - 2004-05-03 15:04:17
|
Update of /cvsroot/ro-oslib/OSLib/!OsLib/OSLibSupport/Choices_ In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13995/!OsLib/OSLibSupport/Choices_ Modified Files: .cvsignore Added Files: AMUmakefile GNUmakefile Modules Removed Files: !Clean,fd7 !Make,fd7 Makefile,fe1 Log Message: merged Unix-Build back into trunk (20040503-1) Index: .cvsignore =================================================================== RCS file: /cvsroot/ro-oslib/OSLib/!OsLib/OSLibSupport/Choices_/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** .cvsignore 27 Nov 2002 22:10:57 -0000 1.3 --- .cvsignore 3 May 2004 15:03:22 -0000 1.4 *************** *** 1,5 **** o o32 obj obj32 ! .directory \ No newline at end of file --- 1,7 ---- o o32 + *.o + *.o32 obj obj32 ! .directory --- NEW FILE: AMUmakefile --- # OSLibSupport/Choices_/AMUmakefile # build OSLibSupport/Choices_ under RISC OS #------------------------------------------------------ include Modules include ^.AMUmakefile/source #------------------------------------------------------ --- !Make,fd7 DELETED --- --- !Clean,fd7 DELETED --- --- Makefile,fe1 DELETED --- --- NEW FILE: GNUmakefile --- # OSLibSupport/Choices_/GNUmakefile # build OSLibSupport/Choices_ under UNIX #------------------------------------------------------ include Modules include ../GNUmakefile.source #------------------------------------------------------ --- NEW FILE: Modules --- # OSLibSupport/Choices_/Modules #------------------------------------------------------ TARGET := Choices DIR := Choices_ CHOICES_TARGET := ${TARGET} CHOICES_DIR := ${DIR} GNUMODULES += $(addsuffix .o, $(addprefix ${_DIR}/, ${_TARGET})) GNUMODULES32 += $(addsuffix .o32, $(addprefix ${CHOICES_DIR}/, ${CHOICES_TARGET})) AMUMODULES += $(addprefix ${CHOICES_DIR}.o., ${CHOICES_TARGET}) AMUMODULES32 += $(addprefix ${CHOICES_DIR}.o32., ${CHOICES_TARGET}) |
|
From: Tony v. d. H. <to...@us...> - 2004-05-03 15:04:17
|
Update of /cvsroot/ro-oslib/OSLib/!OsLib/OSLibSupport/X_ In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13995/!OsLib/OSLibSupport/X_ Modified Files: .cvsignore Added Files: AMUmakefile GNUmakefile Make,fd7 Modules Removed Files: !Clean,fd7 !Make,fd7 Makefile,fe1 Log Message: merged Unix-Build back into trunk (20040503-1) Index: .cvsignore =================================================================== RCS file: /cvsroot/ro-oslib/OSLib/!OsLib/OSLibSupport/X_/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** .cvsignore 27 Nov 2002 22:10:58 -0000 1.3 --- .cvsignore 3 May 2004 15:03:25 -0000 1.4 *************** *** 1,4 **** --- 1,5 ---- *.o *.o,* + *.o32 o o32 --- NEW FILE: AMUmakefile --- # OSLibSupport.X_.GNUmakefile # build OSLibSupport.X_ under RISC OS #------------------------------------------------------ include Modules include ^.AMUmakefile/source --- !Make,fd7 DELETED --- --- !Clean,fd7 DELETED --- --- NEW FILE: Make,fd7 --- echo <sys$time> AMU -D -f <Obey$Dir>.AMUmakefile -desktop %0 echo <sys$time> --- Makefile,fe1 DELETED --- --- NEW FILE: GNUmakefile --- # OSLibSupport/X_/GNUmakefile # build OSLibSupport/X_ under UNIX #------------------------------------------------------ include Modules include ../GNUmakefile.source --- NEW FILE: Modules --- # OSLibSupport/X_/Modules #------------------------------------------------------ TARGET := X DIR := X_ X_TARGET := ${TARGET} X_DIR := ${DIR} GNUMODULES += $(addsuffix .o, $(addprefix ${X_DIR}/, ${X_TARGET})) GNUMODULES32 += $(addsuffix .o32, $(addprefix ${X_DIR}/, ${X_TARGET})) AMUMODULES += $(addprefix ${X_DIR}.o., ${X_TARGET}) AMUMODULES32 += $(addprefix ${X_DIR}.o32., ${X_TARGET}) #------------------------------------------------------ |
|
From: Tony v. d. H. <to...@us...> - 2004-05-03 15:04:16
|
Update of /cvsroot/ro-oslib/OSLib/!OsLib/OSLibSupport/trace_ In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13995/!OsLib/OSLibSupport/trace_ Modified Files: .cvsignore Added Files: AMUmakefile GNUmakefile Make,fd7 Modules Removed Files: !Clean,fd7 !Make,fd7 Makefile,fe1 Log Message: merged Unix-Build back into trunk (20040503-1) Index: .cvsignore =================================================================== RCS file: /cvsroot/ro-oslib/OSLib/!OsLib/OSLibSupport/trace_/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** .cvsignore 27 Nov 2002 22:10:58 -0000 1.2 --- .cvsignore 3 May 2004 15:03:26 -0000 1.3 *************** *** 1,4 **** --- 1,5 ---- *.o *.o,* + *.o32 o o32 --- NEW FILE: AMUmakefile --- # OSLibSupport.trace_.AMUmakefile # build OSLibSupport.trace_ under RISC OS #------------------------------------------------------ include Modules include ^.AMUmakefile/source --- !Make,fd7 DELETED --- --- !Clean,fd7 DELETED --- --- NEW FILE: Make,fd7 --- echo <sys$time> AMU -D -f <Obey$Dir>.AMUmakefile -desktop %0 echo <sys$time> --- Makefile,fe1 DELETED --- --- NEW FILE: GNUmakefile --- # OSLibSupport/trace_/GNUmakefile # build OSLibSupport/trace_ under UNIX #------------------------------------------------------ include Modules include ../GNUmakefile.source --- NEW FILE: Modules --- # OSLibSupport/trace_/Modules #------------------------------------------------------ TARGET := trace DIR := trace_ TRACE_TARGET := ${TARGET} TRACE_DIR := ${DIR} GNUMODULES += $(addsuffix .o, $(addprefix ${TRACE_DIR}/, ${TRACE_TARGET})) GNUMODULES32 += $(addsuffix .o32, $(addprefix ${TRACE_DIR}/, ${TRACE_TARGET})) AMUMODULES += $(addprefix ${TRACE_DIR}.o., ${TRACE_TARGET}) AMUMODULES32 += $(addprefix ${TRACE_DIR}.o32., ${TRACE_TARGET}) #------------------------------------------------------ |
|
From: Tony v. d. H. <to...@us...> - 2004-05-03 15:03:43
|
Update of /cvsroot/ro-oslib/OSLib/!OsLib/Tools/DefMod2/defmod/support/doc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13995/!OsLib/Tools/DefMod2/defmod/support/doc Removed Files: callback lookup m realloc resource riscos trace Log Message: merged Unix-Build back into trunk (20040503-1) --- resource DELETED --- --- callback DELETED --- --- lookup DELETED --- --- trace DELETED --- --- realloc DELETED --- --- riscos DELETED --- --- m DELETED --- |
|
From: Tony v. d. H. <to...@us...> - 2004-05-03 15:03:42
|
Update of /cvsroot/ro-oslib/OSLib/!OsLib/Tools/DefMod2/defmod/support In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13995/!OsLib/Tools/DefMod2/defmod/support Removed Files: callback.c callback.h hostfs.h lookup.c lookup.h m.c m.h realloc.c realloc.h resource.c resource.h riscos.c riscos.h riscosa.s trace.c trace.h unix.c x.c x.h Log Message: merged Unix-Build back into trunk (20040503-1) --- unix.c DELETED --- --- riscos.c DELETED --- --- lookup.c DELETED --- --- riscosa.s DELETED --- --- callback.c DELETED --- --- realloc.c DELETED --- --- lookup.h DELETED --- --- riscos.h DELETED --- --- realloc.h DELETED --- --- callback.h DELETED --- --- m.h DELETED --- --- trace.c DELETED --- --- x.c DELETED --- --- hostfs.h DELETED --- --- resource.c DELETED --- --- x.h DELETED --- --- trace.h DELETED --- --- m.c DELETED --- --- resource.h DELETED --- |
|
From: Tony v. d. H. <to...@us...> - 2004-05-03 15:03:41
|
Update of /cvsroot/ro-oslib/OSLib/!OsLib/Tools/DefMod2/defmod/oslib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13995/!OsLib/Tools/DefMod2/defmod/oslib Removed Files: OS.Hdr Types.Hdr fileswitch.h font.h hostfs.h macros.h messagetrans.h os.h osargs.h osfile.h osfind.h osgbpb.h osmodule.h osspriteop.h taskwindow.h territory.h types.h wimp.h Log Message: merged Unix-Build back into trunk (20040503-1) --- macros.h DELETED --- --- wimp.h DELETED --- --- fileswitch.h DELETED --- --- osfind.h DELETED --- --- osmodule.h DELETED --- --- territory.h DELETED --- --- taskwindow.h DELETED --- --- osargs.h DELETED --- --- os.h DELETED --- --- types.h DELETED --- --- hostfs.h DELETED --- --- osfile.h DELETED --- --- osgbpb.h DELETED --- --- messagetrans.h DELETED --- --- osspriteop.h DELETED --- --- font.h DELETED --- --- Types.Hdr DELETED --- --- OS.Hdr DELETED --- |
|
From: Tony v. d. H. <to...@us...> - 2004-05-03 15:03:41
|
Update of /cvsroot/ro-oslib/OSLib/!OsLib/Tools/DefMod2/defmod/Build_RISCOS In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13995/!OsLib/Tools/DefMod2/defmod/Build_RISCOS Added Files: AMUmakefile Make,fd7 Removed Files: !Clean,fd7 !Make,fd7 !Release,fd7 Log Message: merged Unix-Build back into trunk (20040503-1) --- NEW FILE: AMUmakefile --- # Index: OSLib/!OsLib/Tools/DefMod2/defmod/Build_RISCOS/AMUmakefile 20040223 # AMUmakefile for DefMod2 build for and under RISC OS ALL = ${TARGET} TARGET = DefMod VPATH = ^.sources <OSLib$ToolsDir>.support DEFINES = RISCOS EXECUTE_ON_RISCOS YYDEBUG=0 USE_OBJASM INCLUDES = ^.sources C: <OSLib$ToolsDir> <OSLib$ToolsDir>.support LIBS = C:o.Stubs ASMINCLUDES = <OSLib$ToolsDir>.oslib YACC = OSLibBin:bison #Lists of derived objects C = \ c.defmod MODULES = \ defmod \ asmhelp \ callback \ chelp \ def \ cheader \ hdr \ lookup \ objasm \ realloc \ resource \ riscos \ riscosa \ cstrong \ x TRACEMODULES = \ trace \ m EXTRAOBJS = ${C} .include <OSLib$ToolsDir>.AMUmakefile/source #------------------------------------------------------------------------ #internal targets .SUFFIXES: .o .c .y .s defmod.o: defmod.c ${CC} defmod.c -o defmod.o c.defmod: y.defmod ${MD} c ${YACC} -o c.defmod ^.sources.y.defmod #------------------------------------------------------------------------ # Dynamic dependencies: --- !Make,fd7 DELETED --- --- !Clean,fd7 DELETED --- --- !Release,fd7 DELETED --- --- NEW FILE: Make,fd7 --- Echo <Sys$Time> !OSLib.Tools.DefMod2.Defmod.Build_RISCOS.Make %0 WIMPSlot -min 2048K -max 2048K ZapCommand SAVEALL if "<C$MODE>" = "32" then Do AMU -f <Obey$Dir>.AMUmakefile -D -desktop %0 APCS=32 if "<C$MODE>" <>"32" then Do AMU -f <Obey$Dir>.AMUmakefile -D -desktop %0 APCS=26 Echo <Sys$Time> Done. |
|
From: Tony v. d. H. <to...@us...> - 2004-05-03 15:03:40
|
Update of /cvsroot/ro-oslib/OSLib/!OsLib/Tools/DefMod2/defmod/Build_GNU In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13995/!OsLib/Tools/DefMod2/defmod/Build_GNU Added Files: .cvsignore GNUmakefile Log Message: merged Unix-Build back into trunk (20040503-1) --- NEW FILE: .cvsignore --- defmod .directory defmod.c --- NEW FILE: GNUmakefile --- # # Makefile for defmod for UNIX. # #------------------------------------------------------------------------ #target-specific macros TRACE ?= 0 BINDIR ?= ../../../../Bin TARGET = defmod MODULES = \ ${TARGET} \ asmhelp \ cheader \ chelp \ cstrong \ def \ hdr \ objasm # modules from support SUPPORTMODULES= \ kernel \ lookup \ os \ osfile \ osfind \ realloc \ unix \ x # modules required if tracing TRACEMODULES = \ trace \ m \ osargs \ osgbpb INCLUDES = -I. -I../sources -I../../.. -I../../../support DEFINES = -DUNIX -DEXECUTE_ON_UNIX -D${ASMCMD} -D__swi VPATH = ../sources ../../../support ../../../oslib/unix SUPPORTOBJS = $(patsubst %,%.o,${SUPPORTMODULES}) TRACEOBJS = $(patsubst %,%.o,${TRACEMODULES}) TARGETOBJS = $(patsubst %,%.o,${MODULES}) OBJS = ${TARGETOBJS} ${SUPPORTOBJS} ifneq (${TRACE},0) OBJS += ${TRACEOBJS} endif #define which assembler DefMod should use # USE_GCC for GCC # USE_ARMASM for PACE/solaris # USE_OBJASM for RISC OS ASMCMD = USE_GCC #------------------------------------------------------------------------ # tools CC = gcc CFLAGS = -Wall -funsigned-char LD = gcc LDFLAGS = YACC = bison YFLAGS = CP = cp -f #------------------------------------------------------------------------ #targets .PHONY: all clean realclean all: ${TARGET} ${TARGET}: ${OBJS} defmod.c ${LD} ${LDFLAGS} -o $@ ${OBJS} if [ ! -d ${BINDIR} ]; then mkdir ${BINDIR}; fi ${CP} $@ ${BINDIR}/ support: clean: ;rm -f ${TARGETOBJS} ${SUPPORTOBJS} ${TRACEOBJS} ${TARGET} ${TARGET}.c realclean: clean find . -type l -exec rm -f {} \; #------------------------------------------------------------------------ # general rules: .SUFFIXES: .SUFFIXES: .o .c .y .c.o: ;${CC} ${CFLAGS} ${INCLUDES} ${DEFINES} -DTRACE=${TRACE} -o $@ -c $< .y.c: ;${YACC} -y -o $@ $< |
|
From: Tony v. d. H. <to...@us...> - 2004-05-03 15:03:40
|
Update of /cvsroot/ro-oslib/OSLib/!OsLib/Tools/DefMod2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13995/!OsLib/Tools/DefMod2 Added Files: AMUmakefile GNUmakefile Log Message: merged Unix-Build back into trunk (20040503-1) --- NEW FILE: AMUmakefile --- # # AMUmakefile for defmod under RISC OS # MAKE = amu -desktop #------------------------------------------------------------------------ #targets .PHONY: all clean distclean tree all: ;${MAKE} -f ${MAKEFILEDIR}.defmod.Build_RISCOS.AMUmakefile all APCS=${APCS} clean: ;${MAKE} -f ${MAKEFILEDIR}.defmod.Build_RISCOS.AMUmakefile clean distclean: ;${MAKE} -f ${MAKEFILEDIR}.defmod.Build_RISCOS.AMUmakefile distclean tree: ;${MAKE} -f ${MAKEFILEDIR}.defmod.Build_RISCOS.AMUmakefile tree --- NEW FILE: GNUmakefile --- # # Makefile for defmod for UNIX. # #------------------------------------------------------------------------ #------------------------------------------------------------------------ # tools CC = gcc CFLAGS = -Wall -funsigned-char LD = gcc LDFLAGS = YACC = bison YFLAGS = CP = cp -f #------------------------------------------------------------------------ #targets .PHONY: all clean all: ;${MAKE} -C defmod/Build_GNU all clean: ;${MAKE} -C defmod/Build_GNU clean |
|
From: Tony v. d. H. <to...@us...> - 2004-05-03 15:03:39
|
Update of /cvsroot/ro-oslib/OSLib/!OsLib/Tools In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13995/!OsLib/Tools Added Files: AMUmakefile AMUmakefile.source GNUmakefile GNUmakefile.source Make,fd7 Removed Files: !Clean,fd7 !Make,fd7 Log Message: merged Unix-Build back into trunk (20040503-1) --- NEW FILE: GNUmakefile --- # # Makefile for OSLib Tools for UNIX. # #------------------------------------------------------------------------ #targets ALL = BindHelp DefMod2 IndexHelp ReduceAOF .PHONY: ${ALL} clean all: ${ALL} BindHelp: ${MAKE} -C BindHelp DefMod2: ${MAKE} -C DefMod2 IndexHelp: ${MAKE} -C IndexHelp ReduceAOF: ${MAKE} -C ReduceAOF clean: ;$(foreach TARGET, ${ALL}, ${MAKE} -C ${TARGET} clean; ) #------------------------------------------------------------------------ --- !Clean,fd7 DELETED --- --- NEW FILE: Make,fd7 --- | Tools.Make 20040306 set Make$Dir <Obey$Dir> if "<C$MODE>" = "32" then Do AMU -f <Make$Dir>.AMUmakefile -desktop %0 APCS=32 if "<C$MODE>" <>"32" then Do AMU -f <Make$Dir>.AMUmakefile -desktop %0 APCS=26 Echo <Sys$Time> Done... --- NEW FILE: AMUmakefile --- # Index: OSLib/!OsLib/Tools/AMUmakefile 20040225 #=================================================================== # DIR = ${MAKEFILEDIR} COPYFLAGS = A~C~DFLN~P~Q~R~S~T~V RM = rm -nq MAKE = amu -desktop # build all tools all: stage2 stage1 @echo # build tools which don't depend on OSLib stage1: ifndef APCS $(error APCS mode is undefined) endif ${MAKE} -f ${DIR}.bison.AMUmakefile all APCS=${APCS} ${MAKE} -f ${DIR}.DefMod2.AMUmakefile all APCS=${APCS} ${MAKE} -f ${DIR}.ReduceAOF.AMUmakefile all APCS=${APCS} ${MAKE} -f ${DIR}.Rm.AMUmakefile all APCS=${APCS} ${MAKE} -f ${DIR}.ToLower.AMUmakefile all APCS=${APCS} # build tools which depend on OSLib stage2: ifndef APCS $(error APCS mode is undefined) endif ${MAKE} -f ${DIR}.BindHelp.AMUmakefile all APCS=${APCS} ${MAKE} -f ${DIR}.IndexHelp.AMUmakefile all APCS=${APCS} ${MAKE} -f ${DIR}.StripDepends.AMUmakefile all APCS=${APCS} clean: ${MAKE} -f ${DIR}.BindHelp.AMUmakefile clean ${MAKE} -f ${DIR}.DefMod2.AMUmakefile clean ${MAKE} -f ${DIR}.IndexHelp.AMUmakefile clean ${MAKE} -f ${DIR}.ReduceAOF.AMUmakefile clean ${MAKE} -f ${DIR}.Rm.AMUmakefile clean ${MAKE} -f ${DIR}.StripDepends.AMUmakefile clean ${MAKE} -f ${DIR}.bison.AMUmakefile clean ${MAKE} -f ${DIR}.ToLower.AMUmakefile clean distclean: ${MAKE} -f ${DIR}.BindHelp.AMUmakefile distclean ${MAKE} -f ${DIR}.DefMod2.AMUmakefile distclean ${MAKE} -f ${DIR}.IndexHelp.AMUmakefile distclean ${MAKE} -f ${DIR}.ReduceAOF.AMUmakefile distclean ${MAKE} -f ${DIR}.Rm.AMUmakefile distclean ${MAKE} -f ${DIR}.StripDepends.AMUmakefile distclean ${MAKE} -f ${DIR}.bison.AMUmakefile distclean ${MAKE} -f ${DIR}.ToLower.AMUmakefile distclean --- NEW FILE: AMUmakefile.source --- # # Include Makefile for Tools under RISC OS. # # caller must define TARGET, MODULES, INCLUDES # caller may define DEFINES, VPATH #TARGET = #MODULES = #INCLUDES = #DEFINES = #VPATH = #LIBS = #CLIST ?= -list DEBUG ?= 0 TRACE ?= 0 ALL ?= ${TARGET} BINDIR ?= <OSLib$BinDir> #------------------------------------------------------------------------ #tools MAKE = amu -desktop -D CC = \ cc -c ${THROWBACK} \ $(addprefix -f, ${CFLAGS}) \ $(addprefix -W, ${CWARN} ) \ $(addprefix -I, ${INCLUDES}) \ $(addprefix -D, ${DEFINES} ) \ ${DEPEND} \ ${CLIST} \ -apcs 3/${APCS} CFLAGS = af CWARN = cp #DEPEND = -depend !Depend THROWBACK = -throwback ifeq (${APCS},32) OSLIB =OSLib32 SUPPORT = OSLibSupport32 else OSLIB =OSLib SUPPORT = OSLibSupport endif ifneq (${DEBUG},0) DEFINES += DEBUG=${DEBUG} endif ifneq (${TRACE},0) DEFINES += TRACE=${TRACE} endif ASM = \ OBJASM $(addprefix -I, ${ASMINCLUDES}) \ ${ASMOPTIONS} ${DEPEND} -stamp -quit -throwback LD = link LDFLAGS = CP = copy copyflags = A~C~DFLN~P~QR~S~T~V MD = cdir RM = rm -nq STRIP = StripDepends #------------------------------------------------------------------------ #macros OBJS = $(addprefix o.,${MODULES}) TRACEOBJS = $(addprefix o.,${TRACEMODULES}) ifneq (${TRACE},0) OBJS += ${TRACEOBJS} endif #------------------------------------------------------------------------ #rules .PHONY: all clean distclean strip #all: ${ALL} # ${MAKE} -f ${MAKEFILEDIR}.AMUmakefile ${BINDIR}.${TARGET} all: ${BINDIR}.${TARGET} ${ALL} ${TARGET}: ${OBJS} ${LD} ${LDFLAGS} -o $@ ${OBJS} ${LIBS} SetType $@ Absolute Access $@ WR/R ${BINDIR}.${TARGET}: ${TARGET} ${MD} ${BINDIR} ${CP} ${TARGET} $@ ${COPYFLAGS} clean: ;-${RM} ${OBJS} ${TRACEOBJS} ${TARGET} ${EXTRAOBJS} distclean: clean strip ${RM} o l strip: ;${STRIP} AMUmakefile #------------------------------------------------------------------------ .SUFFIXES: .o .c .s .y .c.o: ;${MD} o ${CC} -o $@ -c $< .s.o: ;${MD} o ${ASM} -apcs 3/${APCS}bit $< $@ #------------------------------------------------------------------------ --- !Make,fd7 DELETED --- --- NEW FILE: GNUmakefile.source --- # # Include Makefile for Tools under UNIX. # # caller must define TARGET, MODULES, INCLUDES # caller may define DEFINES, VPATH #TARGET = reduceaof #OBJS = ${TARGET}.o #INCLUDES = #VPATH = BINDIR ?= ../../Bin TRACE ?= 0 DEBUG ?= 0 #------------------------------------------------------------------------ #tools CC = gcc LD = gcc CP = cp -f RM = rm -f #------------------------------------------------------------------------ #macros DEFINES ?= -DUNIX -DEXECUTE_ON_UNIX -D__swi CFLAGS = -Wall -funsigned-char OBJS = $(patsubst %,%.o,${MODULES}) TRACEOBJS = $(patsubst %,%.o,${TRACEMODULES}) ifneq (${TRACE},0) OBJS += ${TRACEOBJS} endif #------------------------------------------------------------------------ #rules .PHONY: all clean install all: ${TARGET} ${TARGET}: ${OBJS} ${LD} ${LDFLAGS} -o $@ ${OBJS} if [ ! -d ${BINDIR} ]; then mkdir ${BINDIR}; fi ${CP} $@ ${BINDIR}/ clean: ;-${RM} ${OBJS} ${TRACEOBJS} ${TARGET} #------------------------------------------------------------------------ .SUFFIXES: .o .c .c.o: ;${CC} ${CFLAGS} ${INCLUDES} ${DEFINES} -DTRACE=${TRACE} \ -DDEBUG=${DEBUG} -o $@ -c $< #------------------------------------------------------------------------ |
|
From: Tony v. d. H. <to...@us...> - 2004-05-03 15:03:38
|
Update of /cvsroot/ro-oslib/OSLib/!OsLib/Source/Types/oslib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13995/!OsLib/Source/Types/oslib Added Files: AMUmakefile ColTrans32.Hdr DOSFS32.Hdr DeviceFS32.Hdr FileCore32.Hdr FileSwch32.Hdr GNUmakefile Modules OSArgs32.Hdr OSFSCtrl32.Hdr OSFind32.Hdr OSGBPB32.Hdr PDriver32.Hdr Wimp32.Hdr Log Message: merged Unix-Build back into trunk (20040503-1) --- NEW FILE: OSFind32.Hdr --- --- NEW FILE: OSGBPB32.Hdr --- --- NEW FILE: ColTrans32.Hdr --- --- NEW FILE: OSArgs32.Hdr --- --- NEW FILE: GNUmakefile --- # OSLib/Source/Types/oslib/GNUmakefile TV 20040214 # Makefile for Types/oslib under GNU # SOURCEDIR = ../.. TARGET = Types include Modules include ${SOURCEDIR}/GNUmakefile.source #------------------------------------------------------------------------ --- NEW FILE: Modules --- # OSLib.Source.Types.oslib.Modules TV 20040214 # List of modules comprising Macros # for inclusion in Make files independant of platform # modules with no SWIs MODULES += \ ColTrans32 \ DeviceFS32 \ DOSFS32 \ FileCore32 \ FileSwch32 \ OSArgs32 \ OSCore32 \ OSF32 \ OSFind32 \ OSFSCtrl32 \ OSGBPB32 \ PDriver32 \ Types \ Wimp32 --- NEW FILE: PDriver32.Hdr --- --- NEW FILE: OSFSCtrl32.Hdr --- --- NEW FILE: Wimp32.Hdr --- --- NEW FILE: DOSFS32.Hdr --- --- NEW FILE: AMUmakefile --- # OSLib/Source/Types/oslib/AMUmakefile TV 20040214 # Makefile for Types/oslib under RISC OS # include ${MAKEFILEDIR}.Modules include <OSLib$SourceDir>.AMUmakefile/inc #------------------------------------------------------------------------ --- NEW FILE: FileSwch32.Hdr --- --- NEW FILE: DeviceFS32.Hdr --- --- NEW FILE: FileCore32.Hdr --- |
|
From: Tony v. d. H. <to...@us...> - 2004-05-03 15:03:37
|
Update of /cvsroot/ro-oslib/OSLib/!OsLib/Source/Test/TestFW In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13995/!OsLib/Source/Test/TestFW Added Files: AMUmakefile GNUmakefile Removed Files: !Clean,fd7 !Make,fd7 Log Message: merged Unix-Build back into trunk (20040503-1) --- NEW FILE: AMUmakefile --- # Macros RM = rm -nq STRIP = stripdepends CC = cc -apcs 3/${APCS} -c -fah -throwback -IOSLib:,OSLibSupport: CPP = c++ -o $@ -c -throwback -IC:,OSLib: GCC = gcc -o $@ -c -mstubs -mthrowback -IOsLib: GPP = g++ -o $@ -c -xc++ -mthrowback -IOsLib: LINK = Link ifeq (${APCS},32) OSLIB = OSLib32 SUPPORT = OSLibSupport32 else OSLIB = OSLib SUPPORT = OSLibSupport endif COPYFLAGS = A~C~DFLN~P~Q~R~S~T~V TARGET = TestFW BIN = bin.${TARGET} OBJ = o.${TARGET} DIR = <OSLib$SourceDir>.Test.TestFW LIBS_S = OSLibSupport:o.${SUPPORT} LIBS_OS = OSLib:o.${OSLIB} LIBS_C = C:o.stubs #-------------------------------------------------------------- all: ${BIN} clean: ${RM} -r ${BIN} ${OBJ} l stripdepends: ${STRIP} makefile tree: @cdir o @cdir bin archive_source: cdir ${ARCHIVE} cdir ${ARCHIVE}.c copy ${DIR}.* ${ARCHIVE}.* ${COPYFLAGS} copy ${DIR}.c.* ${ARCHIVE}.c.* ${COPYFLAGS} #-------------------------------------------------------------- ${BIN}: ${OBJ} ${LIBS_OS} ${Libs_S} ${LINK} ${OBJ} ${Libs_S} ${LIBS_OS} ${LIBS_C} -output $@ #General rules .SUFFIXES: .o .c .c.o: ;${CC} $< -o $@ #------------------------------------------------------------------------ # Dynamic dependencies: --- NEW FILE: GNUmakefile --- # Index: OSLib/!OsLib/Source/Test/TestFW/GNUmakefile #=================================================================== #------------------------------------------------------------------------ # paths & directories SOURCEDIR = ../.. BINDIR = ${SOURCEDIR}/../Bin CROSSPATH = /home/riscos/cross/bin #------------------------------------------------------------------------ #target-specific macros TARGET = TestFW OBJS = ${TARGET}.o BIN = ${TARGET},ff8 OSLIB = ${SOURCEDIR}/OSLib.o OSLIB32 = ${SOURCEDIR}/OSLib32.o SOURCES = Computer Core Toolbox User Types Macros INCLUDES = $(addprefix -I${SOURCEDIR}/, ${SOURCES} ) #------------------------------------------------------------------------ #Tools GCC = ${CROSSPATH}/gcc LD = ${CROSSPATH}/gcc RM = rm -f #------------------------------------------------------------------------ #Toolflags #------------------------------------------------------------------------ # Targets .PHONY: all clean all: ${BIN} ${BIN}: ${OBJS} ${OSLIB32} ${LD} -o $@ $^ clean: -${RM} ${OBJS} ${BIN} #------------------------------------------------------------------------ #General rules .SUFFIXES: .o .c .c.o: ${GCC} -c ${INCLUDES} $< -o $@ --- !Clean,fd7 DELETED --- --- !Make,fd7 DELETED --- |
|
From: Tony v. d. H. <to...@us...> - 2004-05-03 15:03:37
|
Update of /cvsroot/ro-oslib/OSLib/!OsLib/Source/Test/TestHDR In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13995/!OsLib/Source/Test/TestHDR Removed Files: !Clean,fd7 !Make,fd7 !Run,fd7 .cvsignore Makefile,fe1 OSLib.Hdr ProcDefs.Hdr test.s Log Message: merged Unix-Build back into trunk (20040503-1) --- .cvsignore DELETED --- --- OSLib.Hdr DELETED --- --- !Make,fd7 DELETED --- --- !Run,fd7 DELETED --- --- Makefile,fe1 DELETED --- --- !Clean,fd7 DELETED --- --- test.s DELETED --- --- ProcDefs.Hdr DELETED --- |
|
From: Tony v. d. H. <to...@us...> - 2004-05-03 15:03:35
|
Update of /cvsroot/ro-oslib/OSLib/!OsLib/Source/Test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13995/!OsLib/Source/Test Added Files: AMUmakefile GNUmakefile Make,fd7 Removed Files: !MakeAll,fd7 !Test_lib,fd7 Log Message: merged Unix-Build back into trunk (20040503-1) --- NEW FILE: AMUmakefile --- # Index: OSLib/!OsLib/Source/Test/Test/AMUmakefile 20040106 # #------------------------------------------------------------------------ # paths & directories DIR = ${MAKEFILEDIR} #------------------------------------------------------------------------ #tools MAKE = amu -desktop RM = rm -nq CP = copy COPYFLAGS = A~C~DFLN~P~Q~R~S~T~V #------------------------------------------------------------------------ #targets .PHONY: all test readvarval TestFW all: readvarval test test: ${MAKE} -f ${DIR}.Test.AMUmakefile all APCS=${APCS} readvarval: ${MAKE} -f ${DIR}.readvarval.AMUmakefile all APCS=${APCS} TestFW: ${MAKE} -f ${DIR}.TestFW.AMUmakefile all APCS=${APCS} clean: ${MAKE} -f ${DIR}.readvarval.AMUmakefile clean ${MAKE} -f ${DIR}.Test.AMUmakefile clean ${MAKE} -f ${DIR}.TestFW.AMUmakefile clean distclean: ${MAKE} -f ${DIR}.readvarval.AMUmakefile distclean ${MAKE} -f ${DIR}.Test.AMUmakefile distclean ${MAKE} -f ${DIR}.TestFW.AMUmakefile distclean --- !Test_lib,fd7 DELETED --- --- NEW FILE: GNUmakefile --- # Index: OSLib/!OsLib/Source/Test/GNUmakefile 20040128 #=================================================================== .PHONY: all Test clean TESTS = Test readvarval all: ;$(foreach dir, ${TESTS}, ${MAKE} -C ${dir}; ) Test: test test: ;${MAKE} -C $@ readvarval: ;${MAKE} -C $@ clean: ;$(foreach dir, ${TESTS}, ${MAKE} -C ${dir} clean; ) --- !MakeAll,fd7 DELETED --- --- NEW FILE: Make,fd7 --- | !OSLib.Source.Test.Make 20040308 Echo <sys$time> !OSLib.Source.Test.Make %0 WimpSlot -min 4096k if "<C$Mode>"= 32 then Do AMU -f <Obey$Dir>.AMUmakeFile -desktop %0 APCS=32 if "<C$Mode>"<>32 then Do AMU -f <Obey$Dir>.AMUmakeFile -desktop %0 APCS=26 Echo <sys$time> Done |
|
From: Tony v. d. H. <to...@us...> - 2004-05-03 15:03:35
|
Update of /cvsroot/ro-oslib/OSLib/!OsLib/Source/Macros/oslib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13995/!OsLib/Source/Macros/oslib Added Files: AMUmakefile GNUmakefile Modules Removed Files: Makefile,fe1 Log Message: merged Unix-Build back into trunk (20040503-1) --- Makefile,fe1 DELETED --- --- NEW FILE: AMUmakefile --- # OSLib/Source/Macros/oslib/AMUmakefile TV 20040214 # Makefile for Macros/oslib under RISC OS # include ${MAKEFILEDIR}.Modules include <OSLib$SourceDir>.AMUmakefile/inc #------------------------------------------------------------------------ --- NEW FILE: GNUmakefile --- # OSLib/Source/Macros/oslib/GNUmakefile TV 20040214 # Makefile for Macros/oslib under GNU # SOURCEDIR = ../.. TARGET = Macros include Modules include ${SOURCEDIR}/GNUmakefile.source #------------------------------------------------------------------------ --- NEW FILE: Modules --- # OSLib.Source.Macros.oslib.Modules TV 20040214 # List of modules comprising Macros # for inclusion in Make files independant of platform # modules with no SWIs MODULES += \ Macros \ |
|
From: Tony v. d. H. <to...@us...> - 2004-05-03 15:03:30
|
Update of /cvsroot/ro-oslib/OSLib/!OsLib/OSLibSupport In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13995/!OsLib/OSLibSupport Added Files: AMUmakefile AMUmakefile.source GNUmakefile GNUmakefile.source Make,fd7 Removed Files: !Clean,fd7 !MakeLib,fd7 Filelist Filelist32 Makefile,fe1 Log Message: merged Unix-Build back into trunk (20040503-1) --- NEW FILE: AMUmakefile --- # OSLibSupport/AMUmakefile # build OSLibSupport under RISC OS #------------------------------------------------------ MAKE = amu -desktop LIBFILE = libfile RM = rm -nq CP = copy COPYFLAGS = A~C~DFLN~P~Q~R~S~T~V MD = cdir #ECHO = @echo $@ #------------------------------------------------------ SOURCES = Choices_ Err_ Events_ Message_ Task_ trace_ X_ LIBS = o.OSLibSupport o.OSLibSupport32 FILES = $(addsuffix .Modules, ${SOURCES} ) HEADERS = \ Choices \ Err \ Event \ Gadgettypes \ Message \ Systypes \ Task \ Toolboxtypes \ trace \ Wimptypes \ X include ${FILES} #------------------------------------------------------ .PHONY: all clean release ${SOURCES} all: ${LIBS} o.OSLibSupport: ${SOURCES} ${ECHO} ${MD} ${MAKEFILEDIR}.o ${LIBFILE} -co ${MAKEFILEDIR}.$@ $(addprefix ${MAKEFILEDIR}.,${AMUMODULES}) o.OSLibSupport32: ${SOURCES} ${ECHO} ${MD} ${MAKEFILEDIR}.o ${LIBFILE} -co ${MAKEFILEDIR}.$@ $(addprefix ${MAKEFILEDIR}.,${AMUMODULES32}) Choices_: ;${ECHO} ${MAKE} -f ${MAKEFILEDIR}.$@.AMUmakefile Err_: ;${ECHO} ${MAKE} -f ${MAKEFILEDIR}.$@.AMUmakefile Events_: ;${ECHO} ${MAKE} -f ${MAKEFILEDIR}.$@.AMUmakefile Message_: ;${ECHO} ${MAKE} -f ${MAKEFILEDIR}.$@.AMUmakefile Task_: ;${ECHO} ${MAKE} -f ${MAKEFILEDIR}.$@.AMUmakefile trace_: ;${ECHO} ${MAKE} -f ${MAKEFILEDIR}.$@.AMUmakefile X_: ;${ECHO} ${MAKE} -f ${MAKEFILEDIR}.$@.AMUmakefile clean: ;${ECHO} ${MAKE} -f ${MAKEFILEDIR}.Choices_.AMUmakefile clean ${MAKE} -f ${MAKEFILEDIR}.Err_.AMUmakefile clean ${MAKE} -f ${MAKEFILEDIR}.Events_.AMUmakefile clean ${MAKE} -f ${MAKEFILEDIR}.Message_.AMUmakefile clean ${MAKE} -f ${MAKEFILEDIR}.Task_.AMUmakefile clean ${MAKE} -f ${MAKEFILEDIR}.trace_.AMUmakefile clean ${MAKE} -f ${MAKEFILEDIR}.X_.AMUmakefile clean ${RM} $(addprefix ${MAKEFILEDIR}.,${LIBS} ) distclean: ;${ECHO} ${MAKE} -f ${MAKEFILEDIR}.Choices_.AMUmakefile distclean ${MAKE} -f ${MAKEFILEDIR}.Err_.AMUmakefile distclean ${MAKE} -f ${MAKEFILEDIR}.Events_.AMUmakefile distclean ${MAKE} -f ${MAKEFILEDIR}.Message_.AMUmakefile distclean ${MAKE} -f ${MAKEFILEDIR}.Task_.AMUmakefile distclean ${MAKE} -f ${MAKEFILEDIR}.trace_.AMUmakefile distclean ${MAKE} -f ${MAKEFILEDIR}.X_.AMUmakefile distclean ${RM} $(addprefix ${MAKEFILEDIR}., ${LIBS} ) ${RM} $(addprefix ${MAKEFILEDIR}., o ) release: ;${ECHO} ifndef RELEASEDIR error RELEASEDIR not defined endif ${MD} ${RELEASEDIR}.OSLibSupport ${CP} SetVars ${RELEASEDIR}.OSLibSupport.* ${COPYFLAGS} ${CP} Doc ${RELEASEDIR}.OSLibSupport.Doc ${COPYFLAGS} ${CP} h ${RELEASEDIR}.OSLibSupport.h ${COPYFLAGS} ${CP} o ${RELEASEDIR}.OSLibSupport.o ${COPYFLAGS} --- NEW FILE: GNUmakefile --- # OSLibSupport/GNUmakefile # build OSLibSupport under UNIX #------------------------------------------------------ CROSSPATH = /home/riscos/cross/bin LIBFILE = ${CROSSPATH}/libfile RM = rm -f CP = cp -pur #------------------------------------------------------ SOURCES = Choices_ Err_ Events_ Message_ Task_ trace_ X_ LIBS = OSLibSupport.o OSLibSupport32.o FILES = $(addsuffix /Modules, ${SOURCES} ) HEADERS = \ Choices \ Err \ Event \ Gadgettypes \ Message \ Systypes \ Task \ Toolboxtypes \ trace \ Wimptypes \ X include ${FILES} #------------------------------------------------------ .PHONY: ${SOURCES} all clean release all: ${LIBS} OSLibSupport.o: ${SOURCES} @if [ ! -a $@ ]; then ${LIBFILE} -c $@; fi; ${LIBFILE} -i $@ $(addsuffix .o, ${MODULES}) OSLibSupport32.o: ${SOURCES} @if [ ! -a $@ ]; then ${LIBFILE} -c $@; fi; ${LIBFILE} -i $@ $(addsuffix .o32, ${MODULES}) Choices_: ;${MAKE} -C $@ Err_: ;${MAKE} -C $@ Events_: ;${MAKE} -C $@ Message_: ;${MAKE} -C $@ Task_: ;${MAKE} -C $@ trace_: ;${MAKE} -C $@ X_: ;${MAKE} -C $@ clean: ;$(foreach dir, ${SOURCES}, ${MAKE} -C ${dir} clean; ) -${RM} ${LIBS} release: ${LIBS} ifndef RELEASEDIR error RELEASEDIR not defined endif @if [ ! -d ${RELEASEDIR} ]; then mkdir -p ${RELEASEDIR}; fi ${CP} SetVars,feb ${RELEASEDIR}/ @if [ ! -d ${RELEASEDIR}/Doc ]; then mkdir -p ${RELEASEDIR}/Doc; fi ${CP} Doc/X ${RELEASEDIR}/Doc/X @if [ ! -d ${RELEASEDIR}/h ]; then mkdir -p ${RELEASEDIR}/h; fi $(foreach file, ${HEADERS}, ${CP} ${file}.h \ ${RELEASEDIR}/h/${file};) @if [ ! -d ${RELEASEDIR}/o ]; then mkdir -p ${RELEASEDIR}/o; fi $(foreach file, ${LIBS}, ${CP} ${file} \ ${RELEASEDIR}/o/$(basename ${file});) --- !MakeLib,fd7 DELETED --- --- NEW FILE: Make,fd7 --- | OSLibSupport.!MakeLib 20031228 | wimpslot -min 1024k echo <sys$time> OSLibSupport.Make %0 AMU -f <Obey$Dir>.AMUmakefile -desktop %0 echo <sys$time> --- Makefile,fe1 DELETED --- --- NEW FILE: AMUmakefile.source --- # OSLibSupport.AMUmakefile/source # common definitions for building OSLibSupport under RISC OS #------------------------------------------------------ SOURCEDIR = <OSLib$SourceDir> SOURCES_0 = Computer Core Toolbox User SOURCES = ${SOURCES_0} Types Macros #------------------------------------------------------ CCFLAGS = INCLUDES = ^ OSLib: #------------------------------------------------------ #Tools LIBFILE = libfile CC = cc -c $(CCFLAGS) $(addprefix -I,${INCLUDES}) -throwback LINK = link MV = RM = rm -nq MD = cdir #------------------------------------------------------ # targets OBJS = $(addprefix o.,${TARGET}) OBJS32 = $(addprefix o32.,${TARGET}) .PHONY: all clean distclean all: ${OBJS} ${OBJS32} clean: ;${RM} ${OBJS} ${OBJS32} distclean: clean ${RM} o o32 #------------------------------------------------------ # internal targets: .SUFFIXES: .SUFFIXES: .o .o32 .c .c.o: ;@${MD} o ${CC} -APCS3/26 -o $@ $< .c.o32: ;@${MD} o32 ${CC} -APCS3/32 -o $@ $< --- Filelist32 DELETED --- --- !Clean,fd7 DELETED --- --- Filelist DELETED --- --- NEW FILE: GNUmakefile.source --- # OSLibSupport/GNUmakefile.source # common definitions for builsing OSLibSupport under UNIX #------------------------------------------------------ CROSSPATH = /home/riscos/cross/bin SOURCEDIR = ../../Source SOURCES_0 = Computer Core Toolbox User SOURCES = ${SOURCES_0} Types Macros #------------------------------------------------------ CCFLAGS = INCLUDES = -I ./ -I../ $(addprefix -I${SOURCEDIR}/, ${SOURCES} ) #------------------------------------------------------ #Tools LIBFILE = ${CROSSPATH}/libfile GCC = ${CROSSPATH}/gcc -c $(CCFLAGS) ${INCLUDES} LINK = ${CROSSPATH}/gcc MV = mv -f RM = rm -f #------------------------------------------------------ # targets OBJS = $(addsuffix .o,${TARGET}) OBJS32 = $(addsuffix .o32,${TARGET}) .PHONY: all clean all: ${OBJS} ${OBJS32} clean: ;-${RM} ${OBJS} ${OBJS32} #------------------------------------------------------ # internal targets: .SUFFIXES: .SUFFIXES: .o .o32 .c .c.o: ${GCC} -mapcs-26 -o $@ $< .c.o32: ${GCC} -o $@ $< |
Update of /cvsroot/ro-oslib/OSLib/!OsLib/Tools/support
In directory sc8-pr-cvs1:/tmp/cvs-serv10228/OSLib/!OsLib/Tools/support
Modified Files:
Tag: unix-build
lookup.c m.c riscos.c riscos.h trace.c unix.c
Added Files:
Tag: unix-build
kernel.c
Log Message:
Unix Build
--- NEW FILE: kernel.c ---
(This appears to be a binary file; contents omitted.)
Index: lookup.c
===================================================================
RCS file: /cvsroot/ro-oslib/OSLib/!OsLib/Tools/support/Attic/lookup.c,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** lookup.c 14 Jan 2004 13:33:17 -0000 1.1.2.1
--- lookup.c 20 Jan 2004 17:08:48 -0000 1.1.2.2
***************
*** 87,91 ****
lookup_t t;
! // tracef ("lookup_new\n");
if ((t = m_ALLOC (sizeof *t)) == NULL)
{
--- 87,91 ----
lookup_t t;
! tracef ("lookup_new\n");
if ((t = m_ALLOC (sizeof *t)) == NULL)
{
***************
*** 101,105 ****
t->count = start_count;
! // tracef ("clearing out entries 0, ..., %d\n" _ t->count - 1);
for (i = 0; i < t->count; i++)
t->entries [i].token = NULL;
--- 101,105 ----
t->count = start_count;
! tracef ("clearing out entries 0, ..., %d\n" _ t->count - 1);
for (i = 0; i < t->count; i++)
t->entries [i].token = NULL;
***************
*** 110,114 ****
if (error != NULL)
{
! // tracef ("ERROR: %s (error 0x%X)\n" _ error->errmess _ error->errnum);
if (t != NULL)
{
--- 110,114 ----
if (error != NULL)
{
! tracef ("ERROR: %s (error 0x%X)\n" _ error->errmess _ error->errnum);
if (t != NULL)
{
***************
*** 127,131 ****
)
{
! // tracef ("lookup_delete\n");
if (t != NULL)
--- 127,131 ----
)
{
! tracef ("lookup_delete\n");
if (t != NULL)
***************
*** 166,170 ****
Entry *e = NULL;
! // tracef ("Lookup\n");
for (i = 0; i < t->count; i++)
--- 166,170 ----
Entry *e = NULL;
! //tracef ("Lookup\n");
for (i = 0; i < t->count; i++)
***************
*** 173,177 ****
{
e = &t->entries [i];
! // tracef ("found an empty slot (%d)\n" _ i);
break;
}
--- 173,177 ----
{
e = &t->entries [i];
! tracef ("Lookup found an empty slot (%d)\n" _ i);
break;
}
***************
*** 182,189 ****
xterritory_collate() in |error|.*/
#ifndef EXECUTE_ON_UNIX
- #if 0
- if (xterritory_collate (territory_CURRENT, s, t->entries [i].token,
- territory_IGNORE_CASE, &collate) != NULL)
- #else
// Make Lookup case-sensitive, to allow otherwise identical C identifiers
// also to make behaviour the same as strcmp()
--- 182,185 ----
***************
*** 191,212 ****
0, &collate) != NULL)
#endif
! #endif
! collate = strcmp (s, t->entries [i].token);
if (collate == 0)
{
e = &t->entries [i];
! // tracef ("found a match (%d)\n" _ i);
break;
}
}
- // if (e == NULL) tracef ("no slot found\n");
-
if (e_out != NULL) *e_out = e;
/*finish:*/
! // if (error != NULL)
! // tracef ("ERROR: %s (error 0x%X)\n" _ error->errmess _ error->errnum);
return error;
}
--- 187,213 ----
0, &collate) != NULL)
#endif
!
! collate = strcmp (s, t->entries [i].token);
if (collate == 0)
{
e = &t->entries [i];
! tracef ("Lookup found a match (%d)\n" _ i);
break;
}
}
if (e_out != NULL) *e_out = e;
+ #if 0
+ if (e == NULL)
+ {tracef ("Lookup: no slot found\n");}
+ else
+ {tracef( "Lookup: returning slot 0x%x\n" _ e );}
+ #endif
+
/*finish:*/
! if (error != NULL)
! {tracef ("Lookup ERROR: %s (error 0x%X)\n" _ error->errmess _ error->errnum);}
return error;
}
***************
*** 223,227 ****
Entry *e;
! // tracef ("lookup (0x%X, \"%s\",)\n" _ t _ s);
if ((error = Lookup (t, s, &e)) != NULL)
--- 224,228 ----
Entry *e;
! //tracef ("lookup (0x%X, \"%s\",)\n" _ t _ s);
if ((error = Lookup (t, s, &e)) != NULL)
***************
*** 230,233 ****
--- 231,235 ----
if (e == NULL || e->token == NULL)
{
+ tracef( "lookup failed: e=0x%x token=0x%x\n" _ e _ e ? e -> token : 0 );
error = riscos_error_lookup (os_GLOBAL_NO_ANY, "NoAny", s);
goto finish;
***************
*** 237,242 ****
finish:
! // if (error != NULL)
! // tracef ("ERROR: %s (error 0x%X)\n" _ error->errmess _ error->errnum);
return error;
}
--- 239,247 ----
finish:
! if (error != NULL)
! {tracef ("lookup ERROR: %s (error 0x%X)\n" _ error->errmess _ error->errnum);}
!
! //tracef( "lookup returning slot: 0x%x\n" _ e->ptr );
!
return error;
}
***************
*** 248,255 ****
Entry *e;
! // tracef ("lookup_insert (0x%X, \"%s\", 0x%X)\n" _ t _ s _ ptr);
if ((error = Lookup (t, s, &e)) != NULL)
goto finish;
if (e == NULL)
--- 253,263 ----
Entry *e;
! tracef ("lookup_insert (0x%X, \"%s\", 0x%X)\n" _ t _ s _ ptr);
if ((error = Lookup (t, s, &e)) != NULL)
+ {
+ tracef( "lookup_insert error: %s\n" _ error -> errmess );
goto finish;
+ }
if (e == NULL)
***************
*** 257,262 ****
Entry *tmp;
! // tracef ("extending the table to count %d (now at 0x%X)\n" _
! // 2*t->count _ t->entries);
if ((tmp = m_REALLOC (t->entries, t->count*sizeof (Entry),
2*t->count*sizeof (Entry))) == NULL)
--- 265,270 ----
Entry *tmp;
! tracef ("extending the table to count %d (now at 0x%X)\n" _
! 2*t->count _ t->entries);
if ((tmp = m_REALLOC (t->entries, t->count*sizeof (Entry),
2*t->count*sizeof (Entry))) == NULL)
***************
*** 266,273 ****
}
t->entries = tmp;
! // tracef ("table extended (now at 0x%X)\n" _ t->entries);
! // tracef ("clearing out entries %d, ..., %d\n" _
! // t->count _ 2*t->count - 1);
memset (t->entries + t->count, '\0', t->count*sizeof (Entry));
--- 274,281 ----
}
t->entries = tmp;
! tracef ("table extended (now at 0x%X)\n" _ t->entries);
! tracef ("clearing out entries %d, ..., %d\n" _
! t->count _ 2*t->count - 1);
memset (t->entries + t->count, '\0', t->count*sizeof (Entry));
***************
*** 275,294 ****
t->count *= 2;
! // tracef ("new count %d\n" _ t->count);
}
! if (e->token == NULL && (e->token = m_ALLOC (riscos_strlen (s) + 1)) ==
! NULL)
{
error = riscos_error_lookup (os_GLOBAL_NO_MEM, "NoMem");
goto finish;
}
riscos_strcpy (e->token, s); /*case may have changed*/
e->ptr = ptr;
finish:
! // if (error != NULL)
! // tracef ("ERROR: %s (error 0x%X)\n" _ error->errmess _ error->errnum);
return error;
}
--- 283,306 ----
t->count *= 2;
! tracef ("new count %d\n" _ t->count);
}
! tracef( "lookup_insert into slot 0x%x\n" _ e );
! if (e->token == NULL && (e->token = m_ALLOC (riscos_strlen (s) + 1)) == NULL)
{
+ tracef( "lookup_insert out of memory\n" );
error = riscos_error_lookup (os_GLOBAL_NO_MEM, "NoMem");
goto finish;
}
+ tracef( "lookup_insert into token 0x%x\n" _ e -> token);
riscos_strcpy (e->token, s); /*case may have changed*/
e->ptr = ptr;
finish:
! if (error != NULL)
! {tracef ("ERROR: %s (error 0x%X)\n" _ error->errmess _ error->errnum);}
!
! //tracef( "lookup_insert done\n" );
return error;
}
***************
*** 303,307 ****
)
{
! // tracef ("lookup_enumerate\n");
if ((int) *context < t->count &&
--- 315,319 ----
)
{
! tracef ("lookup_enumerate\n");
if ((int) *context < t->count &&
Index: m.c
===================================================================
RCS file: /cvsroot/ro-oslib/OSLib/!OsLib/Tools/support/Attic/m.c,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** m.c 14 Jan 2004 13:33:17 -0000 1.1.2.1
--- m.c 20 Jan 2004 17:08:48 -0000 1.1.2.2
***************
*** 21,29 ****
*/
! #undef TRACE
! #define TRACE 1
#if TRACE
! /*#define XTRACE*/
#endif
--- 21,31 ----
*/
! #ifdef TRACE
! #undef TRACE
! #define TRACE 1
! #endif
#if TRACE
! #define XTRACE
#endif
***************
*** 35,46 ****
/*From OSLib*/
! #include "macros.h"
! #include "os.h"
! #include "wimp.h"
/*From Support*/
#include "m.h"
#include "riscos.h"
! #include "svc.h"
#include "trace.h"
--- 37,52 ----
/*From OSLib*/
! #include "oslib/macros.h"
! #include "oslib/os.h"
! #ifndef EXECUTE_ON_UNIX
! #include "oslib/wimp.h"
! #endif
/*From Support*/
#include "m.h"
#include "riscos.h"
! #ifndef EXECUTE_ON_UNIX
! #include "svc.h"
! #endif
#include "trace.h"
***************
*** 95,99 ****
--- 101,107 ----
os_error error;
+ #ifdef XTRACE
trace_f (file, line, "m_assert %s\n", msg);
+ #endif
error.errnum = 1;
***************
*** 101,108 ****
--- 109,120 ----
file, line, msg);
+ #ifndef EXECUTE_ON_UNIX
if (svc_get_mode () == svc_USR)
os_generate_error (&error);
else
xwimp_report_error (&error, NONE, "<<Memory checker>>", NULL);
+ #else
+ fprintf( stderr, "<<Memory checker>>\n%s\n", error.errmess );
+ #endif
}
/*------------------------------------------------------------------------*/
Index: riscos.c
===================================================================
RCS file: /cvsroot/ro-oslib/OSLib/!OsLib/Tools/support/Attic/riscos.c,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** riscos.c 14 Jan 2004 13:33:17 -0000 1.1.2.1
--- riscos.c 20 Jan 2004 17:08:48 -0000 1.1.2.2
***************
*** 134,138 ****
int riscos_strlen
(
! char *s
)
{
--- 134,138 ----
int riscos_strlen
(
! char const *s
)
{
***************
*** 151,159 ****
(
char *s1,
! char *s
)
{
int i = 0;
while ((s1 [i] = s [i]) >= ' ')
i++;
--- 151,161 ----
(
char *s1,
! char const *s
)
{
int i = 0;
+ //tracef ("riscos_strcpy (\"%.*s\")\n" _ riscos_strlen (s) _ s );
+
while ((s1 [i] = s [i]) >= ' ')
i++;
***************
*** 168,173 ****
int riscos_strcmp
(
! char *s0,
! char *s1
)
{
--- 170,175 ----
int riscos_strcmp
(
! char const *s0,
! char const *s1
)
{
***************
*** 199,203 ****
(
char *s1,
! char *s,
int n
)
--- 201,205 ----
(
char *s1,
! char const *s,
int n
)
Index: riscos.h
===================================================================
RCS file: /cvsroot/ro-oslib/OSLib/!OsLib/Tools/support/Attic/riscos.h,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** riscos.h 14 Jan 2004 13:33:17 -0000 1.1.2.1
--- riscos.h 20 Jan 2004 17:08:48 -0000 1.1.2.2
***************
*** 61,71 ****
*/
! extern int riscos_strlen (char *s);
! extern char *riscos_strcpy (char *s1, char *s);
! extern int riscos_strcmp (char *s0, char *s1);
! extern char *riscos_strncpy (char *s1, char *s, int n);
/* Useful string processing functions, designed to allow safe in-line use
--- 61,71 ----
*/
! extern int riscos_strlen (char const *s);
! extern char *riscos_strcpy (char *s1, char const *s);
! extern int riscos_strcmp (char const *s0, char const *s1);
! extern char *riscos_strncpy (char *s1, char const *s, int n);
/* Useful string processing functions, designed to allow safe in-line use
Index: trace.c
===================================================================
RCS file: /cvsroot/ro-oslib/OSLib/!OsLib/Tools/support/Attic/trace.c,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** trace.c 14 Jan 2004 13:33:17 -0000 1.1.2.1
--- trace.c 20 Jan 2004 17:08:48 -0000 1.1.2.2
***************
*** 28,31 ****
--- 28,33 ----
* append a \r if there was a final \n.
*/
+ #undef DEBUG
+ #define DEBUG 0
#undef TRACE
***************
*** 102,109 ****
--- 104,116 ----
if ((val = getenv (var)) == NULL)
+ {
strcpy (to, "v");
+ }
else
strcpy (to, val);
+ #if DEBUG
+ fprintf( stderr, "trace to %s\n", to );
+ #endif
switch (to [0])
{
***************
*** 205,208 ****
--- 212,217 ----
break;
#endif
+ default:
+ break;
}
***************
*** 226,229 ****
--- 235,242 ----
// int len;
+ #if DEBUG
+ fprintf( stderr, "%s %d trace_f\n", __FILE__, __LINE__ );
+ #endif
+
/*Do not do anything once Error is set.*/
if (Error == NULL)
***************
*** 273,279 ****
--- 286,298 ----
case VDU:
+ #if DEBUG
+ fprintf( stderr, "%s %d trace_f: VDU\n", __FILE__, __LINE__ );
+ #endif
if ((error = xos_write0 (s)) != NULL)
goto finish;
break;
+
+ default:
+ break;
}
}
***************
*** 363,366 ****
--- 382,388 ----
case VDU:
+ #if DEBUG
+ fprintf( stderr, "%s %d trace_f: VDU\n", __FILE__, __LINE__ );
+ #endif
for (cc = s; *cc != '\0'; cc++)
{
***************
*** 397,400 ****
--- 419,425 ----
}
break;
+
+ default:
+ break;
}
}
***************
*** 451,454 ****
--- 476,482 ----
goto finish;
break;
+
+ default:
+ break;
}
***************
*** 493,496 ****
--- 521,526 ----
break;
#endif
+ default:
+ break;
}
Index: unix.c
===================================================================
RCS file: /cvsroot/ro-oslib/OSLib/!OsLib/Tools/support/Attic/unix.c,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** unix.c 14 Jan 2004 13:33:17 -0000 1.1.2.1
--- unix.c 20 Jan 2004 17:08:48 -0000 1.1.2.2
***************
*** 1,3 ****
--- 1,6 ----
/*unix.c - emulation of some useful SWIs and functions*/
+ /* this is the same functionality as support/riscos.c
+ but ported to unix
+ */
/*OSLib---efficient, type-safe, transparent, extensible,\n"
***************
*** 56,59 ****
--- 59,64 ----
riscos_strcpy (e->errmess, token);
+ //tracef ( "Error_Lookup %d: %s\n" _ e ->errnum _ e -> errmess );
+
return e;
}
***************
*** 83,86 ****
--- 88,97 ----
va_end (list);
+
+ if ( error == 0 )
+ tracef( "riscos_error_lookup: not found\n" );
+ else
+ tracef( "riscos_error_lookup: %d: %s\n" _ error -> errnum _ error -> errmess );
+
return error;
}
***************
*** 106,111 ****
--- 117,126 ----
riscos_strncpy (&error.errmess [len], msg, os_ERROR_LIMIT - len - 1);
+ #ifdef EXECUTE_ON_UNIX
+ fprintf( stderr, "Assertion failure:\n %s", error.errmess );
+ #else
(void) xwimp_report_error (&error, wimp_ERROR_BOX_SHORT_TITLE,
"Assertion failure", NULL);
+ #endif
}
#endif
***************
*** 116,120 ****
int riscos_strlen
(
! char *s
)
{
--- 131,135 ----
int riscos_strlen
(
! char const *s
)
{
***************
*** 133,137 ****
(
char *s1,
! char *s
)
{
--- 148,152 ----
(
char *s1,
! char const *s
)
{
***************
*** 150,155 ****
int riscos_strcmp
(
! char *s0,
! char *s1
)
{
--- 165,170 ----
int riscos_strcmp
(
! char const *s0,
! char const *s1
)
{
***************
*** 191,195 ****
(
char *s1,
! char *s,
int n
)
--- 206,210 ----
(
char *s1,
! char const *s,
int n
)
|
|
From: <to...@us...> - 2004-01-20 17:08:52
|
Update of /cvsroot/ro-oslib/OSLib/!OsLib/Tools/oslib
In directory sc8-pr-cvs1:/tmp/cvs-serv10228/OSLib/!OsLib/Tools/oslib
Modified Files:
Tag: unix-build
fileswitch.h os.h osargs.h osfind.h osgbpb.h types.h
Added Files:
Tag: unix-build
fileswch32.h osargs32.h oscore32.h osf32.h osfind32.h
osgbpb32.h
Log Message:
Unix Build
--- NEW FILE: fileswch32.h ---
/* fileswch32.h
** Used by FileSwitch.h to create the short synonyms for 32-bit file handles
**
** Tony van der Hoff 10-11-01
*/
#if !defined fileswch32_H
#define fileswch32_H
#if !defined osf32_H
#include "osf32.h"
#endif
#if !defined OSLIB_F8
#define bgetv bgetvw
#define bputv bputvw
#define os_bget os_bgetw
#define os_bput os_bputw
#define xbgetv xbgetvw
#define xbputv xbputvw
#define xos_bget xos_bgetw
#define xos_bput xos_bputw
#endif
#endif
/* End */
--- NEW FILE: osargs32.h ---
/* osargs32.h
** Used by osargs.h to create the short synonyms for 32-bit file handles
**
** Tony van der Hoff 10-11-01
*/
#if !defined osargs32_H
#define osargs32_H
#if !defined osf32_H
#include "osf32.h"
#endif
#if !defined OSLIB_F8
#define osargs_ensure osargs_ensurew
#define osargs_image_stamped osargs_image_stampedw
#define osargs_read_allocation osargs_read_allocationw
#define osargs_read_eof_status osargs_read_eof_statusw
#define osargs_read_ext osargs_read_extw
#define osargs_read_info osargs_read_infow
#define osargs_read_path osargs_read_pathw
#define osargs_read_ptr osargs_read_ptrw
#define osargs_set_allocation osargs_set_allocationw
#define osargs_set_ext osargs_set_extw
#define osargs_set_ptr osargs_set_ptrw
#define xosargs_ensure xosargs_ensurew
#define xosargs_image_stamped xosargs_image_stampedw
#define xosargs_read_allocation xosargs_read_allocationw
#define xosargs_read_eof_status xosargs_read_eof_statusw
#define xosargs_read_ext xosargs_read_extw
#define xosargs_read_info xosargs_read_infow
#define xosargs_read_path xosargs_read_pathw
#define xosargs_read_ptr xosargs_read_ptrw
#define xosargs_set_allocation xosargs_set_allocationw
#define xosargs_set_ext xosargs_set_extw
#define xosargs_set_ptr xosargs_set_ptrw
#endif
#endif
/* End */
--- NEW FILE: oscore32.h ---
/* oscore32.h
** Used by oscore.h to create the short synonyms for 32-bit file handles
**
** Tony van der Hoff 10-11-01
*/
#if !defined oscore32_H
#define oscore32_H
#if !defined osf32_H
#include "osf32.h"
#endif
#if !defined OSLIB_F8
#define os_change_redirection os_change_redirectionw
#endif
#endif
/* End */
--- NEW FILE: osf32.h ---
/* osf32.h
** creates a short-form synonym for OS_FW
**
** Tony van der Hoff 10-11-01
*/
#if !defined osf32_H
#define osf32_H
#undef os_f
#if !defined OSLIB_F8
#define os_f os_fw
#endif
#endif
/* End */
--- NEW FILE: osfind32.h ---
/* osfind32.h
** Used by osfind.h to create the short synonyms for 32-bit file handles
**
** Tony van der Hoff 10-11-01
*/
#if !defined osfind32_H
#define osfind32_H
#if !defined osf32_H
#include "osf32.h"
#endif
#if !defined OSLIB_F8
#define osfind_close osfind_closew
#define osfind_openin osfind_openinw
#define osfind_openout osfind_openoutw
#define osfind_openup osfind_openupw
#define upcallfind_close upcallfind_closew
#define upcallfind_create_openup upcallfind_create_openupw
#define upcallfind_openup upcallfind_openupw
#define xosfind_close xosfind_closew
#define xosfind_openin xosfind_openinw
#define xosfind_openout xosfind_openoutw
#define xosfind_openup xosfind_openupw
#define xupcallfind_close xupcallfind_closew
#define xupcallfind_create_openup xupcallfind_create_openupw
#define xupcallfind_openup xupcallfind_openupw
#endif
#endif
/* End */
--- NEW FILE: osgbpb32.h ---
/* osgbpb32.h
** Used by osgbpb.h to create the short synonyms for 32-bit file handles
**
** Tony van der Hoff 10-11-01
*/
#if !defined osgbpb32_H
#define osgbpb32_H
#if !defined osf32_H
#include "osf32.h"
#endif
#if !defined OSLIB_F8
#define osgbpb_read osgbpb_readw
#define osgbpb_read_at osgbpb_read_atw
#define osgbpb_write osgbpb_writew
#define osgbpb_write_at osgbpb_write_atw
#define xosgbpb_read xosgbpb_readw
#define xosgbpb_read_at xosgbpb_read_atw
#define xosgbpb_write xosgbpb_writew
#define xosgbpb_write_at xosgbpb_write_atw
#endif
#endif
/* End */
Index: fileswitch.h
===================================================================
RCS file: /cvsroot/ro-oslib/OSLib/!OsLib/Tools/oslib/Attic/fileswitch.h,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** fileswitch.h 14 Jan 2004 13:33:16 -0000 1.1.2.1
--- fileswitch.h 20 Jan 2004 17:08:48 -0000 1.1.2.2
***************
*** 239,242 ****
--- 239,244 ----
/*...: is a read only filing system*/
+ #ifndef EXECUTE_ON_UNIX
+
#define xos_bget(file, c, psr) \
_swix (OS_BGet, _IN (1) | _OUT (0) | _OUT (_FLAGS), file, c, psr)
***************
*** 244,247 ****
--- 246,254 ----
#define xos_bput(c, file) \
_swix (OS_BPut, _IN (0) | _IN (1), c, file)
+ #endif /* EXECUTE_ON_UNIX */
+
+ #ifndef fileswch32_H
+ #include "oslib/fileswch32.h"
+ #endif
#endif
Index: os.h
===================================================================
RCS file: /cvsroot/ro-oslib/OSLib/!OsLib/Tools/oslib/Attic/os.h,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** os.h 14 Jan 2004 13:33:16 -0000 1.1.2.1
--- os.h 20 Jan 2004 17:08:48 -0000 1.1.2.2
***************
*** 5820,5822 ****
--- 5820,5826 ----
#endif /* EXECUTE_ON_UNIX */
+ #ifndef oscore32_H
+ #include "oslib/oscore32.h"
+ #endif
+
#endif
Index: osargs.h
===================================================================
RCS file: /cvsroot/ro-oslib/OSLib/!OsLib/Tools/oslib/Attic/osargs.h,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** osargs.h 14 Jan 2004 13:33:16 -0000 1.1.2.1
--- osargs.h 20 Jan 2004 17:08:48 -0000 1.1.2.2
***************
*** 514,516 ****
--- 514,520 ----
#endif /* EXECUTE_ON_UNIX */
+ #ifndef osargs32_H
+ #include "oslib/osargs32.h"
+ #endif
+
#endif
Index: osfind.h
===================================================================
RCS file: /cvsroot/ro-oslib/OSLib/!OsLib/Tools/oslib/Attic/osfind.h,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** osfind.h 14 Jan 2004 13:33:16 -0000 1.1.2.1
--- osfind.h 20 Jan 2004 17:08:48 -0000 1.1.2.2
***************
*** 393,395 ****
--- 393,399 ----
#endif /* EXECUTE_ON_UNIX */
+ #ifndef osfind32_H
+ #include "oslib/osfind32.h"
+ #endif
+
#endif
Index: osgbpb.h
===================================================================
RCS file: /cvsroot/ro-oslib/OSLib/!OsLib/Tools/oslib/Attic/osgbpb.h,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** osgbpb.h 14 Jan 2004 13:33:16 -0000 1.1.2.1
--- osgbpb.h 20 Jan 2004 17:08:48 -0000 1.1.2.2
***************
*** 47,64 ****
#define OSGBPB_DirEntriesFullInfo 0xC
! typedef struct osgbpb_name osgbpb_name;
! typedef struct osgbpb_disc_name osgbpb_disc_name;
! typedef struct osgbpb_dir_name osgbpb_dir_name;
! typedef struct osgbpb_name_list osgbpb_name_list;
! typedef struct osgbpb_info osgbpb_info;
! typedef struct osgbpb_info_base osgbpb_info_base;
! typedef struct osgbpb_brief_info osgbpb_brief_info;
! typedef struct osgbpb_internal_info osgbpb_internal_info;
! typedef struct osgbpb_full_info osgbpb_full_info;
! typedef struct osgbpb_string_list osgbpb_string_list;
! typedef struct osgbpb_brief_info_list osgbpb_brief_info_list;
! typedef struct osgbpb_internal_info_list osgbpb_internal_info_list;
! typedef struct osgbpb_full_info_list osgbpb_full_info_list;
! typedef struct osgbpb_info_list osgbpb_info_list;
typedef struct osgbpb_system_info_list osgbpb_system_info_list;
typedef struct osgbpb_system_info_list_base osgbpb_system_info_list_base;
--- 47,64 ----
#define OSGBPB_DirEntriesFullInfo 0xC
! typedef struct osgbpb_name osgbpb_name;
! typedef struct osgbpb_disc_name osgbpb_disc_name;
! typedef struct osgbpb_dir_name osgbpb_dir_name;
! typedef struct osgbpb_name_list osgbpb_name_list;
! typedef struct osgbpb_info osgbpb_info;
! typedef struct osgbpb_info_base osgbpb_info_base;
! typedef struct osgbpb_brief_info osgbpb_brief_info;
! typedef struct osgbpb_internal_info osgbpb_internal_info;
! typedef struct osgbpb_full_info osgbpb_full_info;
! typedef struct osgbpb_string_list osgbpb_string_list;
! typedef struct osgbpb_brief_info_list osgbpb_brief_info_list;
! typedef struct osgbpb_internal_info_list osgbpb_internal_info_list;
! typedef struct osgbpb_full_info_list osgbpb_full_info_list;
! typedef struct osgbpb_info_list osgbpb_info_list;
typedef struct osgbpb_system_info_list osgbpb_system_info_list;
typedef struct osgbpb_system_info_list_base osgbpb_system_info_list_base;
***************
*** 733,735 ****
--- 733,739 ----
#endif /* EXECUTE_ON_UNIX */
+ #ifndef osgbpb32_H
+ #include "oslib/osgbpb32.h"
+ #endif
+
#endif
Index: types.h
===================================================================
RCS file: /cvsroot/ro-oslib/OSLib/!OsLib/Tools/oslib/Attic/types.h,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** types.h 14 Jan 2004 13:33:16 -0000 1.1.2.1
--- types.h 20 Jan 2004 17:08:48 -0000 1.1.2.2
***************
*** 2,6 ****
#define types_H
! /*OSLib---efficient, type-safe, transparent, extensible,\n"
register-safe A P I coverage of RISC O S*/
/*Copyright © 1994 Jonathan Coxhead*/
--- 2,6 ----
#define types_H
! /*OSLib---efficient, type-safe, transparent, extensible,
register-safe A P I coverage of RISC O S*/
/*Copyright © 1994 Jonathan Coxhead*/
***************
*** 22,72 ****
*/
! #include <kernel.h>
! typedef unsigned int bits, bytes;
! typedef int osbool;
! typedef unsigned char byte;
! #ifndef NULL
! #define NULL ((void *) 0)
#endif
! #define FALSE ((osbool) 0)
! #define TRUE ((osbool) 1)
! #define NONE ((bits) 0)
! #define ALL (~(bits) 0)
! #define SKIP 0
! /*may be used as a "don't care" value for |int|, |... *|, |bits| etc*/
! #define SIG_LIMIT 11 /*largest signal number + 1*/
! #ifndef EXECUTE_ON_UNIX
! #ifndef __swis_h
! #define _C (1U << 29)
! #define _Z (1U << 30)
! #define _N (1U << 31)
#endif
#endif
! #define UNKNOWN 1
! /*may be used to declare arrays of unknown size*/
! #define AS .
#define ASREF ->
! /*may be used for components of a union*/
! #define _ ,
! /*may be used to separate arguments of a macro*/
! /*These may be used to suppress compiler warnings*/
#define NOT_USED(x) {x = x;}
! #define UNSET(x) {(void) &x;}
!
! #ifdef __swi
! #undef __swi
! #define __swi(x) extern
! #endif
#endif
--- 22,144 ----
*/
! /********************
! * Type definitions *
! ********************/
! typedef unsigned int bits;
! typedef int osbool;
! typedef unsigned char byte;
! /* for backward compatibility with non C++ and pre-C99 code
! ** we can typedef |bool| as |osbool|. Anyone who wants to provide
! ** their own definition of |bool| can define BOOL_DEFINED prior to
! ** #includeing this header to prevent the typedef occurring.
! */
! #if !defined BOOL_DEFINED
! /* C99 defines bool as a keyword */
! #if defined __STDC_VERSION__
! #if __STDC_VERSION__ >= 199901L
! #define BOOL_DEFINED
! #endif
! #endif
#endif
! #if !defined BOOL_DEFINED
! /* <stdbool.h> defines bool */
! #if defined __bool_true_false_are_defined
! #define BOOL_DEFINED
! #endif
! #endif
! /* C++ (1998) defines bool as a keyword;
! ** many implementations included it earlier,
! ** but there are some exceptions
! */
! #if !defined BOOL_DEFINED && defined __cplusplus
! /* C++; Assume its's fully compliant */
! #define BOOL_DEFINED
! /* CFront defines |__cplusplus| but not |bool| */
! /* We assume that CFront is only ever used with Norcroft C */
! /* any C99 version of Norcroft will have been trapped previously */
! #if defined __CC_NORCROFT
! #undef BOOL_DEFINED
! #endif
! /* GNU C++ defines bool as a keyword only from V2.7 onwards */
! #if defined __GNUG__
! #if __GNUG__ < 2 || ( __GNUG__ == 2 && __GNUC_MINOR__ < 7 )
! #undef BOOL_DEFINED
! #endif
! #endif
! /* any other exceptions here */
! #endif
!
! /* if it's still not defined, then define our own version */
! #if !defined BOOL_DEFINED
! #define BOOL_IS_OSBOOL
! typedef osbool bool;
! #endif
!
! /************************
! * Constant definitions *
! ************************/
! #ifndef NULL
! #define NULL 0
! #endif
! #ifndef FALSE
! #define FALSE ((osbool) 0)
! #endif
! #ifndef TRUE
! #define TRUE ((osbool) 1)
! #endif
! #ifndef NONE
! #define NONE 0u
! #endif
! #ifndef ALL
! #define ALL (~0u)
! #endif
! #ifndef SKIP
! #define SKIP 0
! #endif
! #ifndef _V
! #define _V 0x10000000u
! #endif
! #ifndef _C
! #define _C 0x20000000u
! #endif
! #ifndef _Z
! #define _Z 0x40000000u
! #endif
! #ifndef _N
! #define _N 0x80000000u
#endif
+ #ifndef ERROR
+ #define ERROR (-2)
+ #endif
+ #ifndef UNKNOWN
+ #define UNKNOWN 1
#endif
! /*********************
! * Macro definitions *
! *********************/
! /*Macros that "change the language"*/
! #define AS .
#define ASREF ->
! #define _ ,
! /* __swi(x) is an optimisation hint unique to Norcroft C */
! /* define it to nothing for other compilers */
! #if defined __swi || !defined __CC_NORCROFT || defined __cplusplus
! #undef __swi
! #define __swi(x) extern
! #endif
! /*Macros that suppress compiler warnings*/
#define NOT_USED(x) {x = x;}
! #define UNSET(x) {(void) &x;}
#endif
|
|
From: <to...@us...> - 2004-01-20 17:08:52
|
Update of /cvsroot/ro-oslib/OSLib/!OsLib/Tools/DefMod2/defmod/sources
In directory sc8-pr-cvs1:/tmp/cvs-serv10228/OSLib/!OsLib/Tools/DefMod2/defmod/sources
Modified Files:
Tag: unix-build
defmod.y hdr.c objasm.c
Log Message:
Unix Build
Index: defmod.y
===================================================================
RCS file: /cvsroot/ro-oslib/OSLib/!OsLib/Tools/DefMod2/defmod/sources/defmod.y,v
retrieving revision 1.2.4.1
retrieving revision 1.2.4.2
diff -C2 -d -r1.2.4.1 -r1.2.4.2
*** defmod.y 14 Jan 2004 13:44:31 -0000 1.2.4.1
--- defmod.y 20 Jan 2004 17:08:47 -0000 1.2.4.2
***************
*** 32,35 ****
--- 32,36 ----
/*From CLib*/
#include <ctype.h>
+ #include <errno.h>
#include <stddef.h>
#include <stdlib.h>
***************
*** 179,184 ****
{ os_error *error;
if ((error = lookup_insert (needses, $1, NULL)) != NULL)
! { yyerror (error->errmess);
YYERROR;
}
--- 180,188 ----
{ os_error *error;
+ tracef( "needs: Inserting \"%s\"\n" _ $1 );
if ((error = lookup_insert (needses, $1, NULL)) != NULL)
! {
! tracef( "Error %s\n" _ error -> errmess );
! yyerror (error->errmess);
YYERROR;
}
***************
*** 190,195 ****
{ os_error *error;
if ((error = lookup_insert (needsatends, $1, NULL)) != NULL)
! { yyerror (error->errmess);
YYERROR;
}
--- 194,202 ----
{ os_error *error;
+ tracef( "needsatend: Inserting \"%s\"\n" _ $1 );
if ((error = lookup_insert (needsatends, $1, NULL)) != NULL)
! {
! tracef( "Error %s\n" _ error -> errmess );
! yyerror (error->errmess);
YYERROR;
}
***************
*** 201,204 ****
--- 208,212 ----
ID EQUALS type COLON const DESCRIPTION_OPTION
{ os_error *error;
+ tracef( "const_defn\n");
def_c c = qalloc (sizeof *c);
def_t t = qalloc (def_sizeof_TYPE ($3.tag));
***************
*** 209,214 ****
c->description = EMPTY ($6)? NULL: qstrdup ($6);
if ((error = lookup_insert (consts, $1, c)) != NULL)
! { yyerror (error->errmess);
YYERROR;
}
--- 217,225 ----
c->description = EMPTY ($6)? NULL: qstrdup ($6);
+ tracef( "Inserting \"%s\"\n" _ $1 );
if ((error = lookup_insert (consts, $1, c)) != NULL)
! {
! tracef( "Error %s\n" _ error -> errmess );
! yyerror (error->errmess);
YYERROR;
}
***************
*** 221,226 ****
def_c c;
if ((error = lookup (consts, $1, (void **) &c)) != NULL)
! { yyerror (error->errmess);
YYERROR;
}
--- 232,240 ----
def_c c;
+ tracef( "const: looking up: \"%s\"\n" _ $1 );
if ((error = lookup (consts, $1, (void **) &c)) != NULL)
! {
! tracef( "Error %s\n" _ error -> errmess );
! yyerror (error->errmess);
YYERROR;
}
***************
*** 242,245 ****
--- 256,260 ----
ID DESCRIPTION_OPTION
{ os_error *error;
+ tracef( "type_defn\n" );
def_t t = qalloc (def_sizeof_TYPE (def_TYPE_ABSTRACT));
***************
*** 249,254 ****
t->description = EMPTY ($2)? NULL: qstrdup ($2);
if ((error = lookup_insert (types, $1, t)) != NULL)
! { yyerror (error->errmess);
YYERROR;
}
--- 264,272 ----
t->description = EMPTY ($2)? NULL: qstrdup ($2);
+ tracef( "Inserting \"%s\"\n" _ $1 );
if ((error = lookup_insert (types, $1, t)) != NULL)
! {
! tracef( "Error %s\n" _ error -> errmess );
! yyerror (error->errmess);
YYERROR;
}
***************
*** 256,259 ****
--- 274,278 ----
ID EQUALS type DESCRIPTION_OPTION
{ os_error *error;
+ tracef( "type_defn\n" );
def_t t = qalloc (def_sizeof_TYPE ($3.tag));
***************
*** 261,266 ****
t->description = EMPTY ($4)? NULL: qstrdup ($4);
if ((error = lookup_insert (types, $1, t)) != NULL)
! { yyerror (error->errmess);
YYERROR;
}
--- 280,288 ----
t->description = EMPTY ($4)? NULL: qstrdup ($4);
+ tracef( "Inserting \"%s\"\n" _ $1 );
if ((error = lookup_insert (types, $1, t)) != NULL)
! {
! tracef( "Error %s\n" _ error -> errmess );
! yyerror (error->errmess);
YYERROR;
}
***************
*** 274,280 ****
def_t t;
if ((error = lookup (types, $2, (void **) &t)) != NULL &&
error->errnum != os_GLOBAL_NO_ANY)
! { yyerror (error->errmess);
YYERROR;
}
--- 296,305 ----
def_t t;
+ tracef( "base_type: looking up: \"%s\"\n" _ $2 );
if ((error = lookup (types, $2, (void **) &t)) != NULL &&
error->errnum != os_GLOBAL_NO_ANY)
! {
! tracef( "Error %s\n" _ error -> errmess );
! yyerror (error->errmess);
YYERROR;
}
***************
*** 318,322 ****
$$.value = def_VALUE_REGISTER; $$.description = NULL;} |
REF type
! { def_t t = qalloc (def_sizeof_TYPE ($2.tag));
memcpy (t, &$2, def_sizeof_TYPE ($2.tag));
--- 343,349 ----
$$.value = def_VALUE_REGISTER; $$.description = NULL;} |
REF type
! {
! tracef( "type\n" );
! def_t t = qalloc (def_sizeof_TYPE ($2.tag));
memcpy (t, &$2, def_sizeof_TYPE ($2.tag));
***************
*** 345,349 ****
$$.description = NULL;
if ($2.tag != def_TYPE_VOID)
! { $$.data AS list.base = qalloc (def_sizeof_TYPE ($2.tag));
memcpy ($$.data AS list.base, &$2, def_sizeof_TYPE ($2.tag));
}
--- 372,378 ----
$$.description = NULL;
if ($2.tag != def_TYPE_VOID)
! {
! tracef( "type\n" );
! $$.data AS list.base = qalloc (def_sizeof_TYPE ($2.tag));
memcpy ($$.data AS list.base, &$2, def_sizeof_TYPE ($2.tag));
}
***************
*** 358,362 ****
} |
SUB const BUS type
! { def_t t = qalloc (def_sizeof_TYPE ($4.tag));
if ($4.value == def_VALUE_VARIABLE)
--- 387,393 ----
} |
SUB const BUS type
! {
! tracef( "type\n" );
! def_t t = qalloc (def_sizeof_TYPE ($4.tag));
if ($4.value == def_VALUE_VARIABLE)
***************
*** 379,385 ****
def_t t;
if ((error = lookup (types, $1, (void **) &t)) != NULL &&
error->errnum != os_GLOBAL_NO_ANY)
! { yyerror (error->errmess);
YYERROR;
}
--- 410,419 ----
def_t t;
+ tracef( "type: looking up ID: \"%s\"\n" _ $1 );
if ((error = lookup (types, $1, (void **) &t)) != NULL &&
error->errnum != os_GLOBAL_NO_ANY)
! {
! tracef( "Error %s\n" _ error -> errmess );
! yyerror (error->errmess);
YYERROR;
}
***************
*** 390,393 ****
--- 424,428 ----
{ /*have to make an optimistic assumption*/
$$.value = def_VALUE_REGISTER;
+ tracef( "type \"%s\" undefined\n" _ $1 );
if (Verbose && !Quiet)
fprintf (stderr, "warning: type \"%s\" undefined at line "
***************
*** 398,401 ****
--- 433,438 ----
$$.description = NULL;
strcpy ($$.data AS id, $1);
+
+ tracef( "type: ID done\n" );
};
***************
*** 404,408 ****
typed_var: type COLON ID DESCRIPTION_OPTION
! { $$ = $1;
$$.name = qstrdup ($3);
$$.description = EMPTY ($4)? NULL: qstrdup ($4);
--- 441,447 ----
typed_var: type COLON ID DESCRIPTION_OPTION
! {
! tracef( "type\n" );
! $$ = $1;
$$.name = qstrdup ($3);
$$.description = EMPTY ($4)? NULL: qstrdup ($4);
***************
*** 410,414 ****
toided_var: toid COLON ID DESCRIPTION_OPTION
! { $$ = $1;
$$.name = qstrdup ($3);
$$.description = EMPTY ($4)? NULL: qstrdup ($4);
--- 449,455 ----
toided_var: toid COLON ID DESCRIPTION_OPTION
! {
! tracef( "type\n" );
! $$ = $1;
$$.name = qstrdup ($3);
$$.description = EMPTY ($4)? NULL: qstrdup ($4);
***************
*** 420,429 ****
ID EQUALS swi
{ os_error *error;
def_s s = qalloc (sizeof *s);
*s = $3;
if ((error = lookup_insert (swis, $1, s)) != NULL)
! { yyerror (error->errmess);
YYERROR;
}
--- 461,474 ----
ID EQUALS swi
{ os_error *error;
+ tracef( "type\n" );
def_s s = qalloc (sizeof *s);
*s = $3;
+ tracef( "Inserting \"%s\"\n" _ $1 );
if ((error = lookup_insert (swis, $1, s)) != NULL)
! {
! tracef( "Error %s\n" _ error -> errmess );
! yyerror (error->errmess);
YYERROR;
}
***************
*** 447,452 ****
entry_condition:
REG CONTAINS typed_var
! { if ($3.value != def_VALUE_REGISTER)
! { yyerror ("type cannot occur in a register");
YYERROR;
}
--- 492,501 ----
entry_condition:
REG CONTAINS typed_var
! {
! tracef( "entry_condition\n" );
! if ($3.value != def_VALUE_REGISTER)
! {
! tracef( "Error: type cannot occur in a register\n" );
! yyerror ("type cannot occur in a register");
YYERROR;
}
***************
*** 454,461 ****
$$.i |= 1 << $1;
$$.inputs [$1] = qalloc (def_sizeof_TYPE ($3.tag));
memcpy ($$.inputs [$1], &$3, def_sizeof_TYPE ($3.tag));
} |
REG REFERENCES typed_var
! { $$ = Empty;
$$.i |= 1 << $1;
$$.ri |= 1 << $1;
--- 503,514 ----
$$.i |= 1 << $1;
$$.inputs [$1] = qalloc (def_sizeof_TYPE ($3.tag));
+ tracef( "memcpy to 0x%x\n" _ $$.inputs [$1] );
memcpy ($$.inputs [$1], &$3, def_sizeof_TYPE ($3.tag));
+ tracef( "done\n" );
} |
REG REFERENCES typed_var
! {
! tracef( "entry_condition\n" );
! $$ = Empty;
$$.i |= 1 << $1;
$$.ri |= 1 << $1;
***************
*** 463,467 ****
memcpy ($$.inputs [$1], &$3, def_sizeof_TYPE ($3.tag));
} |
- /* REG CONSTANT NUM description_OPTION */ /* TV 990418 */
REG CONSTANT const description_OPTION
{ $$ = $4;
--- 516,519 ----
***************
*** 473,477 ****
} |
REG DISJOINS typed_var
! { if ($3.value != def_VALUE_REGISTER)
{ yyerror ("type cannot occur in a register");
YYERROR;
--- 525,531 ----
} |
REG DISJOINS typed_var
! {
! tracef( "entry_condition\n" );
! if ($3.value != def_VALUE_REGISTER)
{ yyerror ("type cannot occur in a register");
YYERROR;
***************
*** 488,492 ****
} |
REG ADDS typed_var
! { if ($3.value != def_VALUE_REGISTER)
{ yyerror ("type cannot occur in a register");
YYERROR;
--- 542,548 ----
} |
REG ADDS typed_var
! {
! tracef( "entry_condition\n" );
! if ($3.value != def_VALUE_REGISTER)
{ yyerror ("type cannot occur in a register");
YYERROR;
***************
*** 499,503 ****
} |
REG EXCLUSIVELY_DISJOINS typed_var
! { if ($3.value != def_VALUE_REGISTER)
{ yyerror ("type cannot occur in a register");
YYERROR;
--- 555,561 ----
} |
REG EXCLUSIVELY_DISJOINS typed_var
! {
! tracef( "entry_condition\n" );
! if ($3.value != def_VALUE_REGISTER)
{ yyerror ("type cannot occur in a register");
YYERROR;
***************
*** 516,520 ****
exit_condition:
REG pling_OPTION CONTAINS typed_var
! { if ($4.value != def_VALUE_REGISTER)
{ yyerror ("type cannot occur in a register");
YYERROR;
--- 574,580 ----
exit_condition:
REG pling_OPTION CONTAINS typed_var
! {
! tracef( "exit_condition\n" );
! if ($4.value != def_VALUE_REGISTER)
{ yyerror ("type cannot occur in a register");
YYERROR;
***************
*** 527,531 ****
} |
REG pling_OPTION REFERENCES typed_var
! { $$ = Empty;
if ($2) $$.value = 1 << $1;
$$.o |= 1 << $1;
--- 587,593 ----
} |
REG pling_OPTION REFERENCES typed_var
! {
! tracef( "exit_condition\n" );
! $$ = Empty;
if ($2) $$.value = 1 << $1;
$$.o |= 1 << $1;
***************
*** 568,573 ****
TITLE: t i t l e ws {tracef ("TITLE\n");};
AUTHOR: a u t h o r ws {tracef ("AUTHOR\n");};
- /* TV 20021116 fix the 16 shift/reduce errors
- NEEDS: n e e d s ws {tracef ("NEEDS\n");};*/
NEEDS: n e e d s ws_item_SEQUENCE {tracef ("NEEDS\n");};
NEEDSATEND: n e e d s a t e n d ws {tracef ("NEEDSATEND\n");};
--- 630,633 ----
***************
*** 961,971 ****
/* perform a malloc with error checking */
void *qalloc (size_t t)
! { void *p;
! if ((p = malloc (t)) == NULL)
! { yyerror ("not enough memory for |qalloc()|");
exit (1);
}
return p;
}
--- 1021,1035 ----
/* perform a malloc with error checking */
void *qalloc (size_t t)
! { void *p = 0;
! //tracef( "qalloc(0x%x)\n" _ t );
! p = malloc (t);
! if (!p)
! {
! yyerror ("not enough memory for |qalloc()|");
exit (1);
}
+ //tracef( "qalloc returns 0x%x\n" _ p );
return p;
}
***************
*** 1031,1034 ****
--- 1095,1111 ----
trace_initialise ("Trace$To");
+ #if TRACE
+ {
+ int ii;
+ tracef( "Main:" );
+ for ( ii = 0; ii<argc; ++ii )
+ {
+ os_writec( ' ' );
+ os_write0( argv[ii] );
+ }
+ os_new_line();
+ }
+ #endif
+
if ( (error = lookup_new (&needses, 16)) != NULL ||
(error = lookup_new (&needsatends, 16)) != NULL ||
***************
*** 1038,1042 ****
(error = lookup_new (&main_byte_wide, 16)) != NULL
)
! goto finish;
yydebug = 0;
--- 1115,1122 ----
(error = lookup_new (&main_byte_wide, 16)) != NULL
)
! {
! tracef( "Error %s\n" _ error -> errmess );
! goto finish;
! }
yydebug = 0;
***************
*** 1069,1113 ****
output = argv [++i];
else if (strcmp (argv [i], "-help") == 0)
- #if 0 /* TV 20021116 get rid of the macro > 10 lines warning */
- { if ((error = xos_pretty_print ("DefMod " VERSION_INFO
- ". Copyright © Jonathan Coxhead, 1994.\r"
- "DefMod comes with ABSOLUTELY NO WARRANTY.\r"
- "This is free software, and you are welcome to redistribute it "
- "under certain conditions. See the file Copying for details.\r"
- "Usage: DefMod <type> [-v] [-help] "
- "[-o <output-dir> | > <output-file>] "
- "[-byte_wide <byte-wide-file>] "
- "[-26bit | -32bit] "
- "< <module-interface-file>\r"
- "Purpose: generate output from a module interface file\r"
- "-v\t\t" "verbose\r"
- "-q\t\t" "quiet\r"
- "-o\t\t" "is required when generating a "
- "directory\r"
- "<output-dir>\t" "directory to create\r"
- "-byte_wide\t" "is required with -s or -l for a "
- "module interface using byte-wide "
- "types defined elsewhere\r"
- "<byte-wide-file>\t" "file containing whitespace-separated "
- "names of byte-wide types\r"
- "-26bit\t\t" "generate 26 bit code" HELP_STRING_26 "\r"
- "-32bit\t\t" "generate 32 bit code" HELP_STRING_32 "\r"
-
- "<type> is one of:\r"
- "\t-asmhelp\t" "SrcEdit assembler help file\r"
- "\t-asmstrong\t" "StrongHelp assembler help "
- "directory (not implemented)\r"
- "\t-chelp\t\t" "SrcEdit C help file\r"
- "\t-cstrong\t" "StrongHelp C help directory\r"
- "\t-h\t\t" "C header file\r"
- "\t-hdr\t\t" "ObjAsm header file\r"
- "\t-h++\t\t" "C++ header file (experimental)\r"
- "\t-l\t\t" "Directory for running LibFile -c "
- "-via ViaFile\r"
- "\t-p\t\t" "Pascal header file (not "
- "implemented)\r"
- "\t-s\t\t" "ObjAsm source file\r",
- NULL, NULL)) != NULL)
- #else
{ const char* helptext = "DefMod " VERSION_INFO
". Copyright © Jonathan Coxhead, 1994.\r"
--- 1149,1152 ----
***************
*** 1150,1158 ****
if ((error = xos_pretty_print (helptext, NULL, NULL)) != NULL)
! #endif
! goto finish;
}
else if (strcmp (argv [i], "-byte_wide") == 0)
! { /*Add the contents of the given file to the byte wide table.*/
char buffer [256], *cc;
#ifdef EXECUTE_ON_UNIX
--- 1189,1197 ----
if ((error = xos_pretty_print (helptext, NULL, NULL)) != NULL)
! goto finish;
}
else if (strcmp (argv [i], "-byte_wide") == 0)
! {
! /*Add the contents of the given file to the byte wide table.*/
char buffer [256], *cc;
#ifdef EXECUTE_ON_UNIX
***************
*** 1166,1169 ****
--- 1205,1210 ----
i++;
+ // tracef( "Main opening file: %s\n" _ argv[i] );
+
#ifdef EXECUTE_ON_UNIX
if ((f = fopen(argv[i],"r")) == NULL) {
***************
*** 1184,1188 ****
#ifdef EXECUTE_ON_UNIX
*cc = c = getc(f);
! if (ferror(f)) {
error = (os_error *)_kernel_last_oserror();
goto finish;
--- 1225,1231 ----
#ifdef EXECUTE_ON_UNIX
*cc = c = getc(f);
! if (ferror(f))
! {
! // tracef( "Error reading character from input stream: %d\n" _ errno );
error = (os_error *)_kernel_last_oserror();
goto finish;
***************
*** 1198,1201 ****
--- 1241,1246 ----
#endif
+ // tracef( "State = %d\n" _ state );
+
switch (state)
{ case Skipping:
***************
*** 1211,1219 ****
else
{ *cc = '\0';
!
if ((error = lookup_insert (main_byte_wide, buffer,
(void *) 1)) != NULL)
! goto finish;
!
cc = buffer;
state = Skipping;
--- 1256,1267 ----
else
{ *cc = '\0';
! tracef( "Inserting \"%s\"\n" _ buffer );
if ((error = lookup_insert (main_byte_wide, buffer,
(void *) 1)) != NULL)
! {
! tracef( "Error %s\n" _ error -> errmess );
! goto finish;
! }
! tracef( "Done: \"%s\"\n" _ buffer );
cc = buffer;
state = Skipping;
***************
*** 1246,1258 ****
if (option == None)
! { Parse_Error = TRUE;
goto finish;
}
yyparse ();
! if (Parse_Error) goto finish;
switch (option)
{ case Objasm:
if ((error = objasm_output (stdout, Title, Author, needses,
needsatends, consts, types, swis, /*separate?*/ FALSE,
--- 1294,1314 ----
if (option == None)
! {
! tracef( "Parse error: No option\n" );
! Parse_Error = TRUE;
goto finish;
}
+ tracef( "yyparse\n" );
yyparse ();
! if (Parse_Error)
! {
! tracef( "yyparse error\n" );
! goto finish;
! }
switch (option)
{ case Objasm:
+ tracef( "Objasm\n" );
if ((error = objasm_output (stdout, Title, Author, needses,
needsatends, consts, types, swis, /*separate?*/ FALSE,
***************
*** 1262,1265 ****
--- 1318,1322 ----
case C_Header:
+ tracef( "C_Header\n" );
if ((error = cheader_output (stdout, Title, Author, needses,
needsatends, consts, types, swis, /*C++?*/ FALSE)) != NULL)
***************
*** 1268,1271 ****
--- 1325,1329 ----
case C_Plus_Plus_Header:
+ tracef( "C_Plus_Plus_Header\n" );
if ((error = cheader_output (stdout, Title, Author, needses,
needsatends, consts, types, swis, /*C++?*/ TRUE)) != NULL)
***************
*** 1274,1277 ****
--- 1332,1336 ----
case C_Help:
+ tracef( "C_Help\n" );
if ((error = chelp_output (stdout, Title, Author, needses,
needsatends, consts, types, swis)) != NULL)
***************
*** 1280,1283 ****
--- 1339,1343 ----
case Asm_Help:
+ tracef( "Asm_Help\n" );
if ((error = asmhelp_output (stdout, Title, Author, needses,
needsatends, consts, types, swis)) != NULL)
***************
*** 1286,1289 ****
--- 1346,1350 ----
case Library:
+ tracef( "Library\n" );
if (output != NULL)
if ((error = objasm_output (SKIP, Title, Author, needses,
***************
*** 1295,1298 ****
--- 1356,1360 ----
case Hdr:
+ tracef( "Hdr\n" );
if ((error = hdr_output (stdout, Title, Author, needses,
needsatends, consts, types, swis)) != NULL)
***************
*** 1301,1304 ****
--- 1363,1367 ----
case C_Strong:
+ tracef( "C_Strong\n" );
if (output != NULL)
if ((error = cstrong_output (output, Title, Author, needses,
***************
*** 1308,1312 ****
default:
! break;
}
--- 1371,1376 ----
default:
! tracef( "default\n" );
! break;
}
***************
*** 1329,1334 ****
*/
int yylex (void)
! { int c;
return
(c = getchar ()) == EOF?
--- 1393,1400 ----
*/
int yylex (void)
! {
! int c;
+ #if 0
return
(c = getchar ()) == EOF?
***************
*** 1350,1353 ****
--- 1416,1446 ----
c
);
+ #else
+ c = getchar ();
+ if ( c == EOF ) c = 0;
+
+ if ( Verbose /* && (c != 0) */ )
+ {
+ if ( ' ' <= c && c <= '~' )
+ fputc( c, stderr );
+ else if ( c == '\n' )
+ {
+ fputc ('\n', stderr);
+ fputc ('\r', stderr);
+ }
+ else
+ {
+ fputc ('\\', stderr);
+ fputc ('x', stderr);
+ fputc (UCHAR (c/0x10), stderr);
+ fputc (UCHAR (c%0x10), stderr);
+ }
+ }
+
+ if ( c == 0 )
+ tracef( "\nyylex: End of file\n" );
+
+ return c;
+ #endif
}
Index: hdr.c
===================================================================
RCS file: /cvsroot/ro-oslib/OSLib/!OsLib/Tools/DefMod2/defmod/sources/hdr.c,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -C2 -d -r1.3.2.1 -r1.3.2.2
*** hdr.c 14 Jan 2004 13:44:31 -0000 1.3.2.1
--- hdr.c 20 Jan 2004 17:08:48 -0000 1.3.2.2
***************
*** 388,391 ****
--- 388,394 ----
goto finish;
break;
+
+ default:
+ break;
}
***************
*** 537,541 ****
#ifdef EXECUTE_ON_UNIX
! if ((rc = sprintf (s, "\"GET oslib/Hdr/%s\"", name)) < 0)
#else
if ((rc = sprintf (s, "\"GET oslib.Hdr.%s\"", name)) < 0)
--- 540,544 ----
#ifdef EXECUTE_ON_UNIX
! if ((rc = sprintf (s, "\"GET oslib/%s.Hdr\"", name)) < 0)
#else
if ((rc = sprintf (s, "\"GET oslib.Hdr.%s\"", name)) < 0)
***************
*** 662,666 ****
--- 665,673 ----
else
{
+ #if 0
if ((rc = sprintf (v1, ":CHR: &%.2X", c->value)) < 0)
+ #else
+ if ((rc = sprintf (v1, "&%.2X", c->value)) < 0)
+ #endif
goto finish;
}
Index: objasm.c
===================================================================
RCS file: /cvsroot/ro-oslib/OSLib/!OsLib/Tools/DefMod2/defmod/sources/objasm.c,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -C2 -d -r1.1 -r1.1.4.1
*** objasm.c 11 Mar 2002 15:09:26 -0000 1.1
--- objasm.c 20 Jan 2004 17:08:48 -0000 1.1.4.1
***************
*** 21,24 ****
--- 21,27 ----
*/
+ #undef TRACE
+ #define TRACE 0
+
/*From CLib*/
#include <ctype.h>
***************
*** 31,34 ****
--- 34,38 ----
#include "oslib/os.h"
#include "oslib/osfile.h"
+ #include "oslib/macros.h"
/*From Support*/
***************
*** 44,51 ****
#define MEM_FOR_OBJASM (1024*1024)
! #ifdef EXECUTE_ON_UNIX
! # define ASMCMD "armasm"
! #else
! # define ASMCMD "ObjAsm"
#endif
--- 48,57 ----
#define MEM_FOR_OBJASM (1024*1024)
! #if !defined ASMCMD
! # ifdef EXECUTE_ON_UNIX
! # define ASMCMD armasm
! # else
! # define ASMCMD ObjAsm
! # endif
#endif
***************
*** 669,673 ****
{
if (!nonx)
! if ((rc = Emit1 (file, "BVS", "%99")) < 0)
goto finish;
--- 675,679 ----
{
if (!nonx)
! if ((rc = Emit1 (file, "BVS", "%a99")) < 0)
goto finish;
***************
*** 1005,1009 ****
#endif
! #ifndef EXECUTE_ON_UNIX
if ((via_file = fopen ("ViaFile", "w+")) == NULL)
{
--- 1011,1015 ----
#endif
! //#ifndef EXECUTE_ON_UNIX
if ((via_file = fopen ("ViaFile", "w+")) == NULL)
{
***************
*** 1012,1016 ****
}
done_fopen_via_file = TRUE;
! #endif
context = 0;
--- 1018,1022 ----
}
done_fopen_via_file = TRUE;
! //#endif
context = 0;
***************
*** 1121,1126 ****
name1, name2, apcs32 ? 32 : 26)) < 0)
goto finish;
#else
! if ((rc = sprintf (cmd, ASMCMD " -from %s -to %s "
"-apcs 3/%dbit/SWstackcheck",
name1, name2, apcs32 ? 32 : 26)) < 0)
--- 1127,1138 ----
name1, name2, apcs32 ? 32 : 26)) < 0)
goto finish;
+
+ #elif ASMCMD == as
+ if ((rc = sprintf (cmd, STR(ASMCMD) " -objasm -o %s %s %s",
+ name2, apcs32 ? "-apcs32 -target SA110" : "", name1)) < 0)
+ goto finish;
+
#else
! if ((rc = sprintf (cmd, STR(ASMCMD) " -from %s -to %s "
"-apcs 3/%dbit/SWstackcheck",
name1, name2, apcs32 ? 32 : 26)) < 0)
***************
*** 1130,1134 ****
tracef ("%s ...\n" _ cmd);
if (!Quiet)
! if ((rc = printf ("Assembling %s\n", name1)) < 0)
goto finish;
--- 1142,1146 ----
tracef ("%s ...\n" _ cmd);
if (!Quiet)
! if ((rc = printf ("%s\n", cmd)) < 0)
goto finish;
|
|
From: <to...@us...> - 2004-01-20 17:08:52
|
Update of /cvsroot/ro-oslib/OSLib/!OsLib/docs
In directory sc8-pr-cvs1:/tmp/cvs-serv10228/OSLib/!OsLib/docs
Modified Files:
Tag: unix-build
Unix_Build
Log Message:
Unix Build
Index: Unix_Build
===================================================================
RCS file: /cvsroot/ro-oslib/OSLib/!OsLib/docs/Attic/Unix_Build,v
retrieving revision 1.1.4.3
retrieving revision 1.1.4.4
diff -C2 -d -r1.1.4.3 -r1.1.4.4
*** Unix_Build 14 Jan 2004 18:10:55 -0000 1.1.4.3
--- Unix_Build 20 Jan 2004 17:08:48 -0000 1.1.4.4
***************
*** 32,40 ****
Changes made to this port include:
made all functions which can provide an output test the pointer for NULL
! implemented osfile_load_stamped_no_path
! implemented osfile_delete
implemented osgbpb_dir_entries_info
! implemented os_writen
! implemented os_pretty_print
implemented osargs_ensurew
--- 32,39 ----
Changes made to this port include:
made all functions which can provide an output test the pointer for NULL
! implemented osfile_load_stamped_no_path, osfile_delete
implemented osgbpb_dir_entries_info
! implemented os_writen, os_write0, os_new_line, os_readc, os_writec,
! os_pretty_print
implemented osargs_ensurew
|
|
From: <to...@us...> - 2004-01-20 17:08:52
|
Update of /cvsroot/ro-oslib/OSLib/!OsLib/Tools/IndexHelp
In directory sc8-pr-cvs1:/tmp/cvs-serv10228/OSLib/!OsLib/Tools/IndexHelp
Modified Files:
Tag: unix-build
GNUmakefile
Log Message:
Unix Build
Index: GNUmakefile
===================================================================
RCS file: /cvsroot/ro-oslib/OSLib/!OsLib/Tools/IndexHelp/Attic/GNUmakefile,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** GNUmakefile 14 Jan 2004 18:10:55 -0000 1.1.2.1
--- GNUmakefile 20 Jan 2004 17:08:48 -0000 1.1.2.2
***************
*** 12,48 ****
VPATH = ../support ../oslib/unix
! #------------------------------------------------------------------------
! # tools
! CC = gcc
! CFLAGS = -Wall
! LD = gcc
! LDFLAGS =
! CP = cp -f
! RM = rm -f
!
! OBJS = $(patsubst %,%.o,${MODULES})
!
! #------------------------------------------------------------------------
! #targets
!
! all: ${TARGET}
!
! ${TARGET}: ${OBJS}
! ${LD} ${LDFLAGS} -o $@ ${OBJS}
! ${CP} $@ ../../bin
!
! .PHONY: clean
!
! clean:
! - ${RM} ${OBJS} ${TARGET}
!
!
! #------------------------------------------------------------------------
! # general rules:
!
! .SUFFIXES: .o .c
!
! .c.o:
! ${CC} ${CFLAGS} ${INCLUDES} ${DEFINES} -o $@ -c $<
!
! #------------------------------------------------------------------------
--- 12,15 ----
VPATH = ../support ../oslib/unix
! # all the general rules are in ../GNUmakefile.source
! include ../GNUmakefile.source
|
|
From: <to...@us...> - 2004-01-20 17:08:52
|
Update of /cvsroot/ro-oslib/OSLib/!OsLib/Tools/ReduceAOF
In directory sc8-pr-cvs1:/tmp/cvs-serv10228/OSLib/!OsLib/Tools/ReduceAOF
Modified Files:
Tag: unix-build
GNUmakefile reduceaof.c
Log Message:
Unix Build
Index: GNUmakefile
===================================================================
RCS file: /cvsroot/ro-oslib/OSLib/!OsLib/Tools/ReduceAOF/Attic/GNUmakefile,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** GNUmakefile 14 Jan 2004 18:10:55 -0000 1.1.2.1
--- GNUmakefile 20 Jan 2004 17:08:48 -0000 1.1.2.2
***************
*** 4,39 ****
TARGET = reduceaof
! OBJS = ${TARGET}.o
! INCLUDES =
! VPATH =
!
! #------------------------------------------------------------------------
! #tools
!
! CC = gcc
! CFLAGS = -DUNIX -DEXECUTE_ON_UNIX
! LD = gcc
! LDFLAGS =
! CP = cp -f
! RM = rm -f
!
! #------------------------------------------------------------------------
!
! all: ${TARGET}
!
! ${TARGET}: ${OBJS}
! ${LD} ${LDFLAGS} -o $@ ${OBJS}
! ${CP} $@ ../../bin
!
! .PHONY: clean
! clean:
! - ${RM} ${OBJS} ${TARGET}
!
!
! #------------------------------------------------------------------------
! .SUFFIXES: .o .c
!
! .c.o:
! ${CC} ${CFLAGS} -o $@ -c $<
! #------------------------------------------------------------------------
--- 4,9 ----
TARGET = reduceaof
! MODULES = ${TARGET}
! # all the general rules are in ../GNUmakefile.source
! include ../GNUmakefile.source
Index: reduceaof.c
===================================================================
RCS file: /cvsroot/ro-oslib/OSLib/!OsLib/Tools/ReduceAOF/reduceaof.c,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -C2 -d -r1.1.4.1 -r1.1.4.2
*** reduceaof.c 14 Jan 2004 18:10:55 -0000 1.1.4.1
--- reduceaof.c 20 Jan 2004 17:08:48 -0000 1.1.4.2
***************
*** 115,119 ****
{
I->CEH[n].fileOffset = place;
! place += I->CEH[n].size + 3 & ~3;
}
}
--- 115,119 ----
{
I->CEH[n].fileOffset = place;
! place += (I->CEH[n].size + 3) & ~3;
}
}
|
|
From: <to...@us...> - 2004-01-20 17:08:52
|
Update of /cvsroot/ro-oslib/OSLib/!OsLib/Tools/oslib/unix
In directory sc8-pr-cvs1:/tmp/cvs-serv10228/OSLib/!OsLib/Tools/oslib/unix
Modified Files:
Tag: unix-build
os.c osfile.c
Log Message:
Unix Build
Index: os.c
===================================================================
RCS file: /cvsroot/ro-oslib/OSLib/!OsLib/Tools/oslib/unix/Attic/os.c,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** os.c 14 Jan 2004 13:33:16 -0000 1.1.2.1
--- os.c 20 Jan 2004 17:08:48 -0000 1.1.2.2
***************
*** 10,14 ****
#include "oslib/os.h"
! //#include "support/unix.h"
#include <signal.h>
--- 10,17 ----
#include "oslib/os.h"
! #include "support/kernel.h"
! #include "support/riscos.h"
! //#include "support/trace.h"
!
#include <signal.h>
***************
*** 396,400 ****
! const os_error *_kernel_last_oserror(void)
{
if (errno == 0) {
--- 399,403 ----
! const os_error *(os_error *)_kernel_last_oserror(void)
{
if (errno == 0) {
***************
*** 548,551 ****
--- 551,577 ----
/* ------------------------------------------------------------------------
+ * Function: os_writec()
+ *
+ * Description: Writes a character to all of the active output streams
+ *
+ * Input: c - value of R0 on entry
+ *
+ * Other notes: Calls SWI 0x0.
+ */
+
+ extern os_error *xos_writec (char c)
+ {
+ if( putchar( c ) == c )
+ return 0;
+ else
+ return (os_error *)_kernel_last_oserror();
+ }
+
+ void os_writec (char c)
+ {
+ xos_writec( c );
+ }
+
+ /* ------------------------------------------------------------------------
* Function: os_writen()
*
***************
*** 568,572 ****
*(temp + size) = '\0';
! fprintf( stderr, "%s\n", temp );
free( temp );
--- 594,598 ----
*(temp + size) = '\0';
! fprintf( stderr, "%s", temp );
free( temp );
***************
*** 614,615 ****
--- 640,733 ----
xos_pretty_print( string, arg1, arg2 );
}
+
+ /* ------------------------------------------------------------------------
+ * Function: os_write0()
+ *
+ * Description: Writes a string to all of the active output streams
+ *
+ * Input: s - value of R0 on entry
+ *
+ * Other notes: Calls SWI 0x2.
+ */
+
+ extern os_error *xos_write0 (char const *s)
+ {
+ os_error *err = 0;
+
+ if( s )
+ {
+ int len = riscos_strlen( s );
+ char* temp = malloc( len + 1 );
+ riscos_strcpy( temp, s );
+ if( fputs( temp, stdout ) < 0 )
+ err = (os_error *)_kernel_last_oserror();
+ free ( temp );
+ }
+ return err;
+ }
+
+ void os_write0 (char const *s)
+ {
+ xos_write0( s );
+ }
+
+ /* ------------------------------------------------------------------------
+ * Function: os_new_line()
+ *
+ * Description: Writes a line feed followed by a carriage return to all
+ * of the active output streams
+ *
+ * Other notes: Calls SWI 0x3.
+ */
+
+ extern os_error *xos_new_line (void)
+ {
+ if( fputs( "\n\r", stdout ) > 0 )
+ return 0;
+ else
+ return (os_error *)_kernel_last_oserror();
+ }
+
+ void os_new_line (void)
+ {
+ xos_new_line();
+ }
+
+ /* ------------------------------------------------------------------------
+ * Function: os_readc()
+ *
+ * Description: Reads a character from the input stream
+ *
+ * Output: c - value of R0 on exit
+ * psr - processor status register on exit (X version only)
+ *
+ * Returns: psr (non-X version only)
+ *
+ * Other notes: Calls SWI 0x4.
+ */
+
+ extern os_error *xos_readc (char *c, bits *psr)
+ {
+ int chr;
+ chr = getchar( );
+
+ if( chr > 0 )
+ {
+ *psr = 0;
+ *c = (char)chr;
+ return 0;
+ }
+ else
+ {
+ *psr = _V;
+ return (os_error *)_kernel_last_oserror();
+ }
+ }
+
+ extern bits os_readc (char *c)
+ {
+ bits psr;
+ xos_readc( c, &psr );
+ return psr;
+ }
+
Index: osfile.c
===================================================================
RCS file: /cvsroot/ro-oslib/OSLib/!OsLib/Tools/oslib/unix/Attic/osfile.c,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** osfile.c 14 Jan 2004 13:33:16 -0000 1.1.2.1
--- osfile.c 20 Jan 2004 17:08:48 -0000 1.1.2.2
***************
*** 3,6 ****
--- 3,13 ----
*/
+ //#define DEBUG
+
+ #ifdef DEBUG
+ # undef DEBUG
+ # define DEBUG 1
+ #endif
+
#include <stdlib.h>
#include <stdio.h>
***************
*** 13,19 ****
# define mkdir _mkdir
#elif defined (UNIX)
! # include <sys/stat.h> /* for mkdir */
#endif
#include "oslib/osfile.h"
--- 20,27 ----
# define mkdir _mkdir
#elif defined (UNIX)
! # include <sys/stat.h> /* for mkdir */
#endif
+ #include "support/trace.h"
#include "oslib/osfile.h"
***************
*** 64,72 ****
NOT_USED(entry_count);
#if defined (UNIX)
! if ( mkdir( uname(dir_name,0,0),
! S_IRUSR | S_IWUSR | S_IXUSR | S_IROTH | S_IWOTH | S_IXOTH
! ) !=0 && errno!=17
! )
#else
if(mkdir(uname(dir_name,0,0))!=0 && errno!=17)
--- 72,84 ----
NOT_USED(entry_count);
+ tracef( "xosfile_create_dir \"%s\"\n" _ dir_name );
+
+ #if DEBUG
+ fprintf( stderr, "xosfile_create_dir \"%s\"\n" , dir_name );
+ #endif
+
#if defined (UNIX)
! if ( mkdir( dir_name, S_IRUSR | S_IWUSR | S_IXUSR | S_IROTH | S_IWOTH | S_IXOTH )
! !=0 && errno!=17 )
#else
if(mkdir(uname(dir_name,0,0))!=0 && errno!=17)
***************
*** 74,78 ****
{
oserr.errnum = 0x10001;
! sprintf(oserr.errmess, "Mkdir error %d", errno);
return &oserr;
}
--- 86,90 ----
{
oserr.errnum = 0x10001;
! sprintf(oserr.errmess, "osfile_create_dir [%d]: %s", errno, strerror(errno));
return &oserr;
}
|
|
From: <to...@us...> - 2004-01-20 17:08:52
|
Update of /cvsroot/ro-oslib/OSLib/!OsLib/Source/User/oslib
In directory sc8-pr-cvs1:/tmp/cvs-serv10228/OSLib/!OsLib/Source/User/oslib
Modified Files:
Tag: unix-build
.cvsignore
Added Files:
Tag: unix-build
GNUmakefile Modules
Log Message:
Unix Build
--- NEW FILE: GNUmakefile ---
# OSLib/Source/User/oslib/GNUmakefile TV 20040120
# Makefile for User/oslib under GNU
#
SOURCEDIR = ../..
include Modules
include ${SOURCEDIR}/GNUmakefile.source
#------------------------------------------------------------------------
.PHONY: ${OSLIB32} ${OSLIB}
${OSLIB}: ${LIBS} ${HDRS} ${OBJS}
${OSLIB32}: ${LIBS32} ${HDRS} ${OBJS32}
--- NEW FILE: Modules ---
# OSLib/Source/User/oslub/Modules
# Module definition file for User Make
# modules containing SWIs
SWIMODULES = \
BASICTrans \
ColourPicker \
CompressJPEG \
ConvertPNG \
DragASprite \
Draw \
DrawFile \
Filter \
Font \
Hourglass \
ImageFileRender \
JPEG \
MimeMap \
PDriver \
PDumper \
Report \
TaskManager \
TaskWindow \
URI \
URL \
Wimp \
WimpExtend \
WimpReadSysInfo \
WimpSpriteOp \
Zipper \
ZLib \
# modules with no SWIs
MODULES = \
Alarm \
Arcweb \
ExtEdit \
Help \
InetSuite \
MakePSFont \
OLE \
PlugIn \
RemotePrinterSupport \
StrongHelp \
Super \
# modules defined other than by SWI definition
CMODULES = \
Index: .cvsignore
===================================================================
RCS file: /cvsroot/ro-oslib/OSLib/!OsLib/Source/User/oslib/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -C2 -d -r1.6 -r1.6.2.1
*** .cvsignore 31 Dec 2003 14:42:40 -0000 1.6
--- .cvsignore 20 Jan 2004 17:08:47 -0000 1.6.2.1
***************
*** 17,20 ****
--- 17,21 ----
*.o
*.o,*
+ *.o32
*.o32,*
*.s
|
10 messages has been excluded from this view by a project administrator.
