procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

modula-2 module registration process seems to fail with shared libraries [PR108261]

Browse source 
The commit adds pathnames to modula-2 which in turn appears in any
external symbol.  This is necessary to allow different dialects of
libraries to coexist (different implementations of SYSTEM and Storage
for example in libm2pim and libm2iso).  It also makes it easier to
debug as the library name forms part of the external mangled name.
By default pathnames are not user facing.  This commit fixes
PR108261.

gcc/ChangeLog:

	PR modula2/108261
	* doc/gm2.texi (-fm2-pathname): New option documented.
	(-fm2-pathnameI): New option documented.
	(-fm2-prefix=): New option documented.
	(-fruntime-modules=): Update default module list.

gcc/m2/ChangeLog:

	PR modula2/108261
	* Make-lang.in (GM2-COMP-BOOT-DEFS): DynamicStringPath.def
	remove.  DynamicPath.def add.
	(GM2-COMP-BOOT-MODS): DynamicStringPath.mod remove.
	DynamicPath.mod add.
	* Make-maintainer.in (BUILD-BOOT-PPG-H): New dependency.
	(m2/gm2-ppg-boot/$(SRC_PREFIX)%.o): $(BUILD-BOOT-PPG-H) Add
	dependency.
	(PGE-DEF): New definition.
	(BUILD-BOOT-PG-H): New dependency.
	(m2/gm2-pg-boot/$(SRC_PREFIX)%.o): $(BUILD-BOOT-PG-H) Add
	dependency.
	(BUILD-BOOT-PGE-H): New dependency.
	(m2/gm2-pge-boot/$(SRC_PREFIX)%.o): $(BUILD-BOOT-PGE-H) Add
	dependency.
	(GM2PATH): Add pathname entries.
	(m2/boot-bin/mc-devel$(exeext)): Add m2/mc-boot-ch/Gm2rtsdummy.o
	dependency.
	(m2/boot-bin/mc-opt$(exeext)): Fix -I path.
	* gm2-compiler/DynamicStringPath.def: Renamed module to
	DynamicPath.
	(GetUserPath): Remove.
	(GetSystemPath): Remove.
	(SetUserPath): Remove.
	(SetSystemPath): Remove.
	(DumpPath): New procedure definition.
	* gm2-compiler/DynamicStringPath.mod: Renamed module to
	DynamicPath.
	(GetUserPath): Remove.
	(GetSystemPath): Remove.
	(SetUserPath): Remove.
	(SetSystemPath): Remove.
	(DumpPath): Remove Debugging conditional.
	* gm2-compiler/M2AsmUtil.mod: Import EqualArray, NulName and
	GetLibName.
	(Debugging): New declaration.
	(GetFullSymName): Re-implemented to prefix (mange) libname
	to any extern variable/procedure which is IsExportQualified.
	* gm2-compiler/M2Comp.mod (qprintLibName): New procedure.
	* gm2-compiler/M2Graph.mod (resolveImports): Add libname.
	* gm2-compiler/M2Options.def (SetM2Prefix): New procedure.
	(GetM2Prefix): New procedure function.
	(SetM2PathName): New procedure.
	(GetM2PathName): New procedure function.
	* gm2-compiler/M2Options.mod: (SetM2Prefix): New procedure implemented.
	(GetM2Prefix): New procedure function implemented.
	(SetM2PathName): New procedure implemented.
	(GetM2PathName): New procedure function implemented.
	(RuntimeModuleOverride): Set to DefaultRuntimeModuleOverride.
	* gm2-compiler/M2Quads.mod: Import GetLibName.
	(SafeRequestSym) Pass result of GetLibName to RequestDependant.
	(callRequestDependant): Add libname as a parameter.
	(BuildM2InitFunction): Add libname as a parameter.
	(BuildM2FiniFunction): Add libname as a parameter.
	(BuildM2CtorFunction): Add libname as a parameter.
	* gm2-compiler/M2Scaffold.mod (LookupModuleSym): Set LibName
	if a definition source was found.
	* gm2-compiler/M2Search.def (FindSourceFile): Add named library parameter.
	(FindSourceDefFile): Add named library parameter.
	(FindSourceModFile): Add named library parameter.
	* gm2-compiler/M2Search.mod (FindSourceFile): Reimplement.
	(FindSourceDefFile): Add named library parameter.
	(FindSourceModFile): Add named library parameter.
	* gm2-compiler/SymbolTable.def (MakeProcedureCtorExtern): Add
	libname parameter.
	(PutLibName): New procedure.
	(GetLibName): New procedure function.
	* gm2-compiler/SymbolTable.mod (MakeProcedureCtorExtern): Add
	libname parameter.
	(GenName): Add libname parameter.
	(InitCtorFields): Add moduleSym as a parameter.
	(PutCtorExtern): Add libname parameter to GenName.
	* gm2-gcc/init.cc (_M2_DynamicStringPath_init): Rename function...
	(_M2_DynamicPath_init): ...to this.
	(_M2_PathName_init): Added.
	* gm2-gcc/m2decl.cc (m2decl_DeclareM2linkStaticInitialization):
	Add m2pim as the manged component of the exported symbol.
	(m2decl_DeclareM2linkForcedModuleInitOrder): Add m2pim mangle prefix.
	* gm2-gcc/m2options.h (M2Options_SetM2Prefix): New function.
	(M2Options_GetM2Prefix): New function.
	(M2Options_SetM2PathName): New function.
	(M2Options_GetM2PathName): New function.
	* gm2-lang.cc (push_back_Ipath): New function.
	(add_one_import_path): New function.
	(gm2_langhook_handle_option): Record -I component.  Call
	SetM2PathName when -fm2-pathname= is seen.  Record -fm2-pathnameI
	component.  Call SetM2Prefix when -fm2-prefix= is seen.
	(gm2_langhook_post_options): Iterative over pathname entries
	and call SetM2PathName, SetSearchPath as appropriate.
	* gm2-libs-iso/M2RTS.def (ConstructModules): Add libname parameter.
	(DeconstructModules): Add libname parameter.
	(RegisterModule): Add libname parameter.
	(RequestDependant): Add libname parameter.
	* gm2-libs-iso/M2RTS.mod (ConstructModules): Add libname parameter.
	(DeconstructModules): Add libname parameter.
	(RegisterModule): Add libname parameter.
	(RequestDependant): Add libname parameter.
	* gm2-libs-min/M2RTS.def (ConstructModules): Add libname parameter.
	(DeconstructModules): Add libname parameter.
	(RegisterModule): Add libname parameter.
	(RequestDependant): Add libname parameter.
	* gm2-libs-min/M2RTS.mod (ConstructModules): Add libname parameter.
	(DeconstructModules): Add libname parameter.
	(RegisterModule): Add libname parameter.
	(RequestDependant): Add libname parameter.
	* gm2-libs/M2Dependent.def (ConstructModules): Add libname parameter.
	(DeconstructModules): Add libname parameter.
	(RegisterModule): Add libname parameter.
	(RequestDependant): Add libname parameter.
	* gm2-libs/M2Dependent.mod (ConstructModules): Add libname parameter.
	(DeconstructModules): Add libname parameter.
	(RegisterModule): Add libname parameter.
	(RequestDependant): Add libname parameter.
	* gm2-libs/M2RTS.def (ConstructModules): Add libname parameter.
	(DeconstructModules): Add libname parameter.
	(RegisterModule): Add libname parameter.
	(RequestDependant): Add libname parameter.
	* gm2-libs/M2RTS.mod (ConstructModules): Add libname parameter.
	(DeconstructModules): Add libname parameter.
	(RegisterModule): Add libname parameter.
	(RequestDependant): Add libname parameter.
	* gm2-libs/RTint.mod (FindVector): Rename variables.
	(initInputVector): Rename variables.
	(initOutputVector): Rename variables.
	(InitTimeVector): Rename variables.
	(FindVectorNo): Rename variables.
	(FindPendingVector): Rename variables.
	(ReArmTimeVector): Rename variables.
	(GetTimeVector): Rename variables.
	(AttachVector): Rename variables.
	(AttachVector): Rename variables.
	(IncludeVector): Rename variables.
	(ExcludeVector): Rename variables.
	(AddFd): Rename variables.
	(AddFd): Rename variables.
	(DumpPendingQueue): Rename variables.
	(stop): Remove.
	(activatePending): Rename variables.
	(Listen): Rename variables.
	* gm2-libs/libc.def (snprintf): New function.
	* gm2-libs/sckt.def: Change all exported identifiers to be
	export qualified.
	* gm2spec.cc (push_back_Ipath): New function.
	(add_m2_I_path): New function.
	(lang_specific_driver): Skip -fm2-pathname= and remember pathname.
	Skip -I and record the path and current pathname.  Call add_m2_I_path.
	* lang-specs.h: Replace %{I*} with %{fm2-pathname*}.
	* lang.opt (-fm2-pathname=): New entry.
	(-fm2-pathname): New entry.
	(-fm2-prefix=): New entry.
	* mc-boot-ch/GUnixArgs.cc (_M2_UnixArgs_dep): New function.
	(_M2_UnixArgs_ctor::_M2_UnixArgs_ctor): New method.
	* mc-boot-ch/Glibc.c (libc_snprintf): New function.
	* mc-boot-ch/m2rts.h (M2RTS_RequestDependant): Changed prototype.
	(M2RTS_RegisterModule): Changed prototype.
	* mc-boot/GDynamicStrings.c: Rebuild.
	* mc-boot/GFIO.c: Rebuild.
	* mc-boot/GIndexing.c: Rebuild.
	* mc-boot/GM2Dependent.c: Rebuild.
	* mc-boot/GM2Dependent.h: Rebuild.
	* mc-boot/GM2EXCEPTION.c: Rebuild.
	* mc-boot/GM2RTS.c: Rebuild.
	* mc-boot/GM2RTS.h: Rebuild.
	* mc-boot/GPushBackInput.c: Rebuild.
	* mc-boot/GRTExceptions.c: Rebuild.
	* mc-boot/GRTint.c: Rebuild.
	* mc-boot/GStdIO.c: Rebuild.
	* mc-boot/GStringConvert.c: Rebuild.
	* mc-boot/GSysStorage.c: Rebuild.
	* mc-boot/Gdecl.c: Rebuild.
	* mc-boot/Gkeyc.c: Rebuild.
	* mc-boot/Glibc.h: Rebuild.
	* mc-boot/GmcComment.c: Rebuild.
	* mc-boot/GmcComp.c: Rebuild.
	* mc-boot/GmcDebug.c: Rebuild.
	* mc-boot/GmcMetaError.c: Rebuild.
	* mc-boot/GmcStack.c: Rebuild.
	* mc-boot/GnameKey.c: Rebuild.
	* mc-boot/GsymbolKey.c: Rebuild.
	* pge-boot/GASCII.c: Rebuild.
	* pge-boot/GArgs.c: Rebuild.
	* pge-boot/GAssertion.c: Rebuild.
	* pge-boot/GDebug.c: Rebuild.
	* pge-boot/GDynamicStrings.c: Rebuild.
	* pge-boot/GFIO.c: Rebuild.
	* pge-boot/GIO.c: Rebuild.
	* pge-boot/GIndexing.c: Rebuild.
	* pge-boot/GLists.c: Rebuild.
	* pge-boot/GM2Dependent.c: Rebuild.
	* pge-boot/GM2Dependent.h: Rebuild.
	* pge-boot/GM2EXCEPTION.c: Rebuild.
	* pge-boot/GM2RTS.c: Rebuild.
	* pge-boot/GM2RTS.h: Rebuild.
	* pge-boot/GNameKey.c: Rebuild.
	* pge-boot/GNumberIO.c: Rebuild.
	* pge-boot/GOutput.c: Rebuild.
	* pge-boot/GPushBackInput.c: Rebuild.
	* pge-boot/GRTExceptions.c: Rebuild.
	* pge-boot/GSFIO.c: Rebuild.
	* pge-boot/GStdIO.c: Rebuild.
	* pge-boot/GStorage.c: Rebuild.
	* pge-boot/GStrCase.c: Rebuild.
	* pge-boot/GStrIO.c: Rebuild.
	* pge-boot/GStrLib.c: Rebuild.
	* pge-boot/GSymbolKey.c: Rebuild.
	* pge-boot/GSysExceptions.c (_M2_SysExceptions_finish): Rename this...
	(_M2_SysExceptions_fini): ... to this.
	* pge-boot/GSysStorage.c: Rebuild.
	(_M2_SysStorage_finish): Rename this...
	(_M2_SysStorage_fini): ... to this.
	* pge-boot/GUnixArgs.cc: New file.
	* pge-boot/Gbnflex.c (_M2_bnflex_finish): Rename this...
	(_M2_bnflex_fini): ... to this.
	* pge-boot/Gerrno.c (_M2_errno_finish): Rename this...
	(_M2_errno_fini): ... to this.
	* pge-boot/Glibc.c (libc_snprintf): New function.
	* pge-boot/Glibc.h (libc_snprintf): New prototype.
	* pge-boot/Gpge.c (_M2_pge_finish): Rename this...
	(_M2_pge_fini): ... to this.
	* pge-boot/Gtermios.cc (_M2_termios_finish): Rename this...
	(_M2_termios_fini): ... to this.
	* pge-boot/main.c (_M2_RTExceptions_finish): Rename this...
	(_M2_RTExceptions_fini): ... to this.
	(_M2_M2EXCEPTION_finish): Rename this...
	(_M2_M2EXCEPTION_fini): ... to this.
	(_M2_M2RTS_finish): Rename this...
	(_M2_M2RTS_fini): ... to this.
	(_M2_SysExceptions_finish): Rename this...
	(_M2_SysExceptions_fini): ... to this.
	(_M2_StrLib_finish): Rename this...
	(_M2_StrLib_fini): ... to this.
	(_M2_errno_finish): Rename this...
	(_M2_errno_fini): ... to this.
	(_M2_termios_finish): Rename this...
	(_M2_termios_fini): ... to this.
	(_M2_IO_finish): Rename this...
	(_M2_IO_fini): ... to this.
	(_M2_StdIO_finish): Rename this...
	(_M2_StdIO_fini): ... to this.
	(_M2_Debug_finish): Rename this...
	(_M2_Debug_fini): ... to this.
	(_M2_SysStorage_finish): Rename this...
	(_M2_SysStorage_fini): ... to this.
	(_M2_Storage_finish): Rename this...
	(_M2_Storage_fini): ... to this.
	(_M2_StrIO_finish): Rename this...
	(_M2_StrIO_fini): ... to this.
	(_M2_DynamicStrings_finish): Rename this...
	(_M2_DynamicStrings_fini): ... to this.
	(_M2_Assertion_finish): Rename this...
	(_M2_Assertion_fini): ... to this.
	(_M2_Indexing_finish): Rename this...
	(_M2_Indexing_fini): ... to this.
	(_M2_NameKey_finish): Rename this...
	(_M2_NameKey_fini): ... to this.
	(_M2_NumberIO_finish): Rename this...
	(_M2_NumberIO_fini): ... to this.
	(_M2_PushBackInput_finish): Rename this...
	(_M2_PushBackInput_fini): ... to this.
	(_M2_SymbolKey_finish): Rename this...
	(_M2_SymbolKey_fini): ... to this.
	(_M2_UnixArgs_finish): Rename this...
	(_M2_UnixArgs_fini): ... to this.
	(_M2_FIO_finish): Rename this...
	(_M2_FIO_fini): ... to this.
	(_M2_SFIO_finish): Rename this...
	(_M2_SFIO_fini): ... to this.
	(_M2_StrCase_finish): Rename this...
	(_M2_StrCase_fini): ... to this.
	(_M2_bnflex_finish): Rename this...
	(_M2_bnflex_fini): ... to this.
	(_M2_Lists_finish): Rename this...
	(_M2_Lists_fini): ... to this.
	(_M2_Args_finish): Rename this...
	(_M2_Args_fini): ... to this.
	(_M2_Output_finish): Rename this...
	(_M2_Output_fini): ... to this.
	(_M2_pge_finish): Rename this...
	(_M2_pge_fini): ... to this.
	* plugin/m2rte.cc (m2_runtime_error_calls): Change all runtime
	procedure names to their name mangled counterparts.
	* gm2-libs-iso/wrapsock.c: Removed.
	* gm2-libs-iso/wraptime.c: Removed.
	* mc-boot/Gpth.h: Removed.
	* gm2-compiler/PathName.def: New file.
	* gm2-compiler/PathName.mod: New file.

libgm2/ChangeLog:

	PR modula2/108261
	* libm2cor/KeyBoardLEDs.cc (EXPORT): New define.
	(M2EXPORT): New define.
	(M2LIBNAME): New define.
	(KeyBoardLEDs_SwitchScroll): EXPORT.
	(KeyBoardLEDs_SwitchNum): EXPORT.
	(KeyBoardLEDs_SwitchCaps): EXPORT.
	(KeyBoardLEDs_SwitchLeds): EXPORT.
	(_M2_KeyBoardLEDs_init): M2EXPORT.
	(_M2_KeyBoardLEDs_finish): M2EXPORT.
	(_M2_KeyBoardLEDs_dep): M2EXPORT.
	* libm2cor/Makefile.am (libm2cor_la_M2FLAGS): Define
	path names.
	* libm2cor/Makefile.in: Rebuild.
	* libm2iso/ErrnoCategory.cc (EXPORT): New define.
	(M2EXPORT): New define.
	(M2LIBNAME): New define.
	(ErrnoCategory_IsErrnoHard): EXPORT.
	(ErrnoCategory_IsErrnoSoft): EXPORT.
	(ErrnoCategory_UnAvailable): EXPORT.
	(ErrnoCategory_GetOpenResults): EXPORT.
	(_M2_ErrnoCategory_init): M2EXPORT.
	(_M2_ErrnoCategory_fini): M2EXPORT.
	(_M2_ErrnoCategory_dep): M2EXPORT.
	(_M2_ErrnoCategory_ctor): M2EXPORT.
	* libm2iso/Makefile.am (libm2iso_la_M2FLAGS): Define
	path names.
	* libm2iso/Makefile.in: Rebuild.
	* libm2iso/RTco.cc (EXPORT): New define.
	(M2EXPORT): New define.
	(M2LIBNAME): New define.
	(newSem): Add module libname prefix to HaltC.
	(currentThread): Remove variable and replace with a function.
	(never): Add module libname prefix to HaltC.
	(initThread): Add module libname prefix to HaltC.
	* libm2iso/m2rts.h (str): New define.
	(M2RTS_RequestDependant): Change to the mangled name equivalent.
	(M2RTS_RegisterModule): Change to the mangled name equivalent.
	(m2iso_M2RTS_RequestDependant): Add libname parameter.
	(m2iso_M2RTS_RegisterModule): Add libname parameter.
	(m2pim_M2RTS_RegisterModule): Add libname parameter.
	(_M2_M2RTS_init): Rename this...
	(m2iso_M2_M2RTS_init): ...to this.
	(M2RTS_ConstructModules): Change to the mangled name equivalent.
	(M2RTS_Terminate): Change to the mangled name equivalent.
	(M2RTS_DeconstructModules): Change to the mangled name equivalent.
	(m2iso_M2RTS_ConstructModules): Add libname parameter.
	(m2iso_M2RTS_Terminate): Add libname parameter.
	(m2iso_M2RTS_DeconstructModules): Add libname parameter.
	(M2RTS_HaltC): Rename this...
	(m2iso_M2RTS_HaltC): ...to this.
	* libm2iso/wrapsock.c (EXPORT): New define.
	(IMPORT): New define.
	(M2EXPORT): New define.
	(M2LIBNAME): New define.
	(m2iso_M2RTS_RequestDependant): Add prototype.
	(wrapsock_clientOpen): EXPORT.
	(wrapsock_clientOpenIP): EXPORT.
	(wrapsock_getClientPortNo): EXPORT.
	(wrapsock_getClientHostname): EXPORT.
	(wrapsock_getClientSocketFd): EXPORT.
	(wrapsock_getClientIP): EXPORT.
	(wrapsock_getPushBackChar): EXPORT.
	(wrapsock_setPushBackChar): EXPORT.
	(wrapsock_getSizeOfClientInfo): EXPORT.
	(_M2_wrapsock_init): M2EXPORT.
	(_M2_wrapsock_fini): M2EXPORT.
	(ctor): M2EXPORT.  New function.
	* libm2iso/wraptime.c: Rename to...
	* libm2iso/wraptime.cc: ...this.
	(EXPORT): New define.
	(M2EXPORT): New define.
	(M2LIBNAME): New define.
	(wraptime_InitTimeval): EXPORT.
	(wraptime_KillTimeval): EXPORT.
	(wraptime_InitTimezone): EXPORT.
	(wraptime_KillTimezone): EXPORT.
	(wraptime_InitTM): EXPORT.
	(wraptime_KillTM): EXPORT.
	(wraptime_gettimeofday): EXPORT.
	(wraptime_settimeofday): EXPORT.
	(wraptime_GetFractions): EXPORT.
	(wraptime_localtime_r): EXPORT.
	(wraptime_GetYear): EXPORT.
	(wraptime_GetMonth): EXPORT.
	(wraptime_GetDay): EXPORT.
	(wraptime_GetHour): EXPORT.
	(wraptime_GetMinute): EXPORT.
	(wraptime_GetSecond): EXPORT.
	(wraptime_GetSummerTime): EXPORT.
	(wraptime_GetDST): EXPORT.
	(wraptime_SetTimezone): EXPORT.
	(wraptime_SetTimeval): EXPORT.
	(_M2_wraptime_init): M2EXPORT.
	(_M2_wraptime_fini): M2EXPORT.
	(ctor): M2EXPORT.  New function.
	* libm2log/Makefile.am (libm2log_la_M2FLAGS): Define
	path names.
	* libm2log/Makefile.in:
	* libm2min/Makefile.am (libm2min_la_M2FLAGS): Define
	path names.
	* libm2min/Makefile.in:
	* libm2pim/Makefile.am (libm2pim_la_M2FLAGS): Define
	path names.
	* libm2pim/Makefile.in:
	* libm2pim/Selective.cc (EXPORT): New define.
	(M2EXPORT): New define.
	(M2LIBNAME): New define.
	(Selective_Select): EXPORT.
	(Selective_InitTime): EXPORT.
	(Selective_GetTime): EXPORT.
	(Selective_SetTime): EXPORT.
	(Selective_KillTime): EXPORT.
	(Selective_InitSet): EXPORT.
	(Selective_KillSet): EXPORT.
	(Selective_FdZero): EXPORT.
	(Selective_FdSet): EXPORT.
	(Selective_FdClr): EXPORT.
	(Selective_FdIsSet): EXPORT.
	(Selective_GetTimeOfDay): EXPORT.
	(Selective_MaxFdsPlusOne): EXPORT.
	(Selective_WriteCharRaw): EXPORT.
	(Selective_ReadCharRaw): EXPORT.
	(_M2_Selective_init): M2EXPORT.
	(_M2_Selective_fini): M2EXPORT.
	(_M2_Selective_dep): M2EXPORT.
	(_M2_Selective_ctor): M2EXPORT.
	* libm2pim/SysExceptions.cc (EXPORT): New define.
	(M2EXPORT): New define.
	(M2LIBNAME): New define.
	(SysExceptions_InitExceptionHandlers): EXPORT.
	(_M2_SysExceptions_init): M2EXPORT.
	(_M2_SysExceptions_fini): M2EXPORT.
	(_M2_SysExceptions_dep): M2EXPORT.
	(_M2_SysExceptions_ctor): M2EXPORT.
	* libm2pim/UnixArgs.cc (EXPORT): New define.
	(M2EXPORT): New define.
	(M2LIBNAME): New define.
	(UnixArgs_GetArgC): EXPORT.
	(UnixArgs_GetArgV): EXPORT.
	(UnixArgs_GetEnvV): EXPORT.
	(_M2_UnixArgs_init): M2EXPORT.
	(_M2_UnixArgs_fini): M2EXPORT.
	(_M2_UnixArgs_dep): M2EXPORT.
	(_M2_UnixArgs_ctor): M2EXPORT.
	* libm2pim/cgetopt.cc (EXPORT): New define.
	(M2EXPORT): New define.
	(M2LIBNAME): New define.
	(cgetopt_getopt): EXPORT.
	(cgetopt_getopt_long): EXPORT.
	(cgetopt_getopt_long_only): EXPORT.
	(cgetopt_InitOptions): EXPORT.
	(cgetopt_KillOptions): EXPORT.
	(cgetopt_SetOption): EXPORT.
	(cgetopt_GetLongOptionArray): EXPORT.
	(_M2_cgetopt_init): M2EXPORT.
	(_M2_cgetopt_fini): M2EXPORT.
	(_M2_cgetopt_dep): M2EXPORT.
	(_M2_cgetopt_ctor): M2EXPORT.
	* libm2pim/dtoa.cc (EXPORT): New define.
	(M2EXPORT): New define.
	(M2LIBNAME): New define.
	(dtoa_strtod): EXPORT.
	(dtoa_calcmaxsig): EXPORT.
	(dtoa_calcdecimal): EXPORT.
	(dtoa_calcsign): EXPORT.
	(dtoa_dtoa): EXPORT.
	(_M2_dtoa_init): M2EXPORT.
	(_M2_dtoa_fini): M2EXPORT.
	(_M2_dtoa_dep): M2EXPORT.
	(_M2_dtoa_ctor): M2EXPORT.
	* libm2pim/errno.cc (EXPORT): New define.
	(M2EXPORT): New define.
	(M2LIBNAME): New define.
	(errno_geterrno): EXPORT.
	(_M2_errno_init): M2EXPORT.
	(_M2_errno_fini): M2EXPORT.
	(_M2_errno_dep): M2EXPORT.
	(_M2_errno_ctor): M2EXPORT.
	* libm2pim/ldtoa.cc (EXPORT): New define.
	(IMPORT): New define.
	(M2EXPORT): New define.
	(M2LIBNAME): New define.
	(dtoa_calcmaxsig): EXPORT.
	(dtoa_calcdecimal): EXPORT.
	(dtoa_calcsign): EXPORT.
	(ldtoa_strtold): EXPORT.
	(ldtoa_ldtoa): EXPORT.
	(_M2_ldtoa_init): M2EXPORT.
	(_M2_ldtoa_fini): M2EXPORT.
	(_M2_ldtoa_dep): M2EXPORT.
	(_M2_ldtoa_ctor): M2EXPORT.
	* libm2pim/sckt.cc (EXPORT): New define.
	(M2EXPORT): New define.
	(M2LIBNAME): New define.
	(tcpServerEstablishPort): EXPORT.
	(tcpServerEstablish): EXPORT.
	(tcpServerAccept): EXPORT.
	(tcpServerPortNo): EXPORT.
	(tcpServerSocketFd): EXPORT.
	(getLocalIP): EXPORT.
	(tcpServerIP): EXPORT.
	(tcpServerClientIP): EXPORT.
	(tcpServerClientPortNo): EXPORT.
	(tcpClientSocket): EXPORT.
	(tcpClientSocketIP): EXPORT.
	(tcpClientConnect): EXPORT.
	(tcpClientPortNo): EXPORT.
	(tcpClientSocketFd): EXPORT.
	(tcpClientIP): EXPORT.
	(_M2_sckt_init): M2EXPORT.
	(_M2_sckt_finish): M2EXPORT.
	(_M2_sckt_dep): M2EXPORT.
	(_M2_sckt_ctor): M2EXPORT.
	* libm2pim/termios.cc (EXPORT): New define.
	(M2EXPORT): New define.
	(M2LIBNAME): New define.
	(_M2_termios_init): M2EXPORT.
	(_M2_termios_fini): M2EXPORT.
	(_M2_termios_dep): M2EXPORT.
	(_M2_termios_ctor): M2EXPORT.
	* libm2pim/wrapc.c (EXPORT): New define.
	(M2EXPORT): New define.
	(M2LIBNAME): New define.
	(wrapc_strtime): EXPORT.
	(wrapc_filesize): EXPORT.
	(wrapc_filemtime): EXPORT.
	(wrapc_fileinode): EXPORT.
	(wrapc_getrand): EXPORT.
	(wrapc_getusername): EXPORT.
	(wrapc_getnameuidgid): EXPORT.
	(wrapc_signbit): EXPORT.
	(wrapc_signbitl): EXPORT.
	(wrapc_signbitf): EXPORT.
	(wrapc_isfinite): EXPORT.
	(wrapc_isfinitel): EXPORT.
	(wrapc_isfinitef): EXPORT.
	(_M2_wrapc_init): M2EXPORT.
	(_M2_wrapc_fini): M2EXPORT.
	(_M2_wrapc_ctor): M2EXPORT.

gcc/testsuite/ChangeLog:

	PR modula2/108261
	* gm2/examples/callingC/pass/examples-callingC-pass.exp: Tidy up
	variable access.
	* gm2/examples/callingC/run/pass/examples-callingC-run-pass.exp: Tidy up
	variable access.
	* gm2/examples/cpp/pass/examples-cpp-pass.exp: Tidy up
	variable access.
	* gm2/examples/cppDef/pass/examples-cppDef-pass.exp: Tidy up
	variable access.
	* gm2/examples/hello/pass/examples-hello-pass.exp: Tidy up
	variable access.
	* gm2/examples/map/pass/examples-map-pass.exp: Tidy up
	variable access.
	* gm2/iso/check/fail/iso-check-fail.exp: Add pathname.
	* gm2/link/externalscaffold/pass/link-externalscaffold-pass.exp:
	Add pathname.
	* gm2/link/externalscaffold/pass/scaffold.c: Add mangled export name.
	* gm2/pimlib/base/run/pass/FIO.mod: Updated test code.
	* gm2/pimlib/base/run/pass/StrLib.mod: Updated test code.
	* gm2/pimlib/base/run/pass/pimlib-base-run-pass.exp: Remove path.
	* gm2/projects/pim/run/pass/random/projects-pim-run-pass-random.exp:
	Tidy up variable access.
	* gm2/switches/auto-init/fail/switches-auto-init-fail.exp: Add pathname.
	* gm2/switches/check-all/pim2/fail/switches-check-all-pim2-fail.exp:
	Add pathname.
	* gm2/switches/makeall/fail/switches-makeall-fail.exp: Remove -fmakeall.
	* gm2/switches/makeall/pass/switches-makeall-pass.exp: Remove -fmakeall.
	* lib/gm2-simple.exp (gm2_keep_executable): New global variable.
	(gm2_simple_execute): Keep executable if global is true.
	* lib/gm2-torture.exp: Add ; after global variable access.
	* lib/gm2.exp: Set up pathnames.
	* gm2/projects/pim/run/pass/tower/AdvCmd.def: New test.
	* gm2/projects/pim/run/pass/tower/AdvCmd.mod: New test.
	* gm2/projects/pim/run/pass/tower/AdvIntroduction.def: New test.
	* gm2/projects/pim/run/pass/tower/AdvIntroduction.mod: New test.
	* gm2/projects/pim/run/pass/tower/AdvMap.def: New test.
	* gm2/projects/pim/run/pass/tower/AdvMap.mod: New test.
	* gm2/projects/pim/run/pass/tower/AdvMath.def: New test.
	* gm2/projects/pim/run/pass/tower/AdvMath.mod: New test.
	* gm2/projects/pim/run/pass/tower/AdvParse.bnf: New test.
	* gm2/projects/pim/run/pass/tower/AdvParse.def: New test.
	* gm2/projects/pim/run/pass/tower/AdvParse.mod: New test.
	* gm2/projects/pim/run/pass/tower/AdvSound.def: New test.
	* gm2/projects/pim/run/pass/tower/AdvSound.mod: New test.
	* gm2/projects/pim/run/pass/tower/AdvSystem.def: New test.
	* gm2/projects/pim/run/pass/tower/AdvSystem.mod: New test.
	* gm2/projects/pim/run/pass/tower/AdvTreasure.def: New test.
	* gm2/projects/pim/run/pass/tower/AdvTreasure.mod: New test.
	* gm2/projects/pim/run/pass/tower/AdvUtil.def: New test.
	* gm2/projects/pim/run/pass/tower/AdvUtil.mod: New test.
	* gm2/projects/pim/run/pass/tower/DrawG.def: New test.
	* gm2/projects/pim/run/pass/tower/DrawG.mod: New test.
	* gm2/projects/pim/run/pass/tower/DrawL.def: New test.
	* gm2/projects/pim/run/pass/tower/DrawL.mod: New test.
	* gm2/projects/pim/run/pass/tower/Dungeon.mod: New test.
	* gm2/projects/pim/run/pass/tower/Lock.def: New test.
	* gm2/projects/pim/run/pass/tower/Lock.mod: New test.
	* gm2/projects/pim/run/pass/tower/ProcArgs.def: New test.
	* gm2/projects/pim/run/pass/tower/ProcArgs.mod: New test.
	* gm2/projects/pim/run/pass/tower/Screen.def: New test.
	* gm2/projects/pim/run/pass/tower/Screen.mod: New test.
	* gm2/projects/pim/run/pass/tower/SocketControl.c: New test.
	* gm2/projects/pim/run/pass/tower/SocketControl.def: New test.
	* gm2/projects/pim/run/pass/tower/Window.def: New test.
	* gm2/projects/pim/run/pass/tower/Window.mod: New test.
	* gm2/projects/pim/run/pass/tower/adv.flex: New test.
	* gm2/projects/pim/run/pass/tower/advflex.c: New test.
	* gm2/projects/pim/run/pass/tower/advflex.def: New test.
	* gm2/projects/pim/run/pass/tower/projects-pim-run-pass-tower.exp:
	New test.
	* gm2/projects/pim/run/pass/tower/star: New test.

Signed-off-by: Gaius Mulley <gaiusmod2@gmail.com>
This commit is contained in:
Gaius Mulley 2023-02-25 16:28:19 +00:00
parent 461d3c84a0
commit 05652ac4e8
188 changed files with 14333 additions and 2436 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
gcc/doc/gm2.texi
View file

@ -484,9 +484,21 @@ where multiple @code{END} keywords are mapped onto a sequence of
@item -fm2-lower-case
render keywords in error messages using lower case.
@item -fm2-pathname=
specify the module mangled prefix name for all modules in the
following include paths.
@item -fm2-pathnameI
for internal use only: used by the driver to copy the user facing -I
option.
@item -fm2-plugin
insert plugin to identify run time errors at compile time (default on).
@item -fm2-prefix=
specify the module mangled prefix name. All exported symbols from a
definition module will have the prefix name.
@item -fm2-statistics
generates quadruple information: number of quadruples generated,
number of quadruples remaining after optimization and number of source
@ -567,12 +579,13 @@ via @samp{-fno-return}.
@item -fruntime-modules=
specify, using a comma separated list, the run time modules and their
order. These modules will initialized first before any other modules
in the application dependency. By default the run time modules list is
set to @code{Storage,SYSTEM,M2RTS,RTExceptions,IOLink}. Note that
these modules will only be linked into your executable if they are
required. So adding a long list of dependent modules will not effect
the size of the executable it merely states the initialization order
should they be required.
in the application dependency. By default the run time modules list
is set to @code{m2iso:RTentity,m2iso:Storage,m2iso:SYSTEM,}
@code{m2iso:M2RTS,m2iso:RTExceptions,m2iso:IOLink}. Note that these
modules will only be linked into your executable if they are required.
Adding a long list of dependent modules will not effect the size of
the executable it merely states the initialization order should they
be required.
@item -fscaffold-dynamic
the option ensures that @samp{gm2} will generate a dynamic scaffold
@ -740,6 +753,8 @@ value | meaning
=================
all | turn on all flags below
module | trace modules as they register themselves
hex | display the hex address of the init/fini functions
warning | show any warnings
pre | generate module list prior to dependency resolution
dep | trace module dependency resolution
post | generate module list after dependency resolution

12
gcc/m2/Make-lang.in
View file

@ -714,7 +714,8 @@ GM2-COMP-BOOT-DEFS = \
M2DebugStack.def \
M2Defaults.def \
M2DriverOptions.def \
DynamicStringPath.def \
DynamicPath.def \
PathName.def \
M2Emit.def \
M2Error.def \
M2EvalSym.def \
@ -786,7 +787,8 @@ GM2-COMP-BOOT-MODS = \
M2DebugStack.mod \
M2Defaults.mod \
M2DriverOptions.mod \
DynamicStringPath.mod \
DynamicPath.mod \
PathName.mod \
M2Emit.mod \
M2Error.mod \
M2FileName.mod \
@ -991,7 +993,8 @@ GM2-COMP-DEFS = \
M2DebugStack.def \
M2Defaults.def \
M2DriverOptions.def \
DynamicStringPath.def \
DynamicPath.def \
PathName.def \
M2Emit.def \
M2Error.def \
M2FileName.def \
@ -1059,7 +1062,8 @@ GM2-COMP-MODS = \
M2DebugStack.mod \
M2Defaults.mod \
M2DriverOptions.mod \
DynamicStringPath.mod \
DynamicPath.mod \
PathName.mod \
M2Emit.mod \
M2Error.mod \
M2FileName.mod \

97
gcc/m2/Make-maintainer.in
View file

@ -95,26 +95,30 @@ BUILD-PPG-LIBS-H = $(PPG-LIB-DEFS:%.def=m2/gm2-ppg-boot/$(SRC_PREFIX)%.h)
BUILD-PPG-H = m2/boot-bin/mc$(exeext) $(BUILD-PPG-LIBS-H)
BUILD-BOOT-PPG-H: $(BUILD-BOOT-H) \
m2/gm2-ppg-boot/$(SRC_PREFIX)M2RTS.h \
m2/gm2-ppg-boot/$(SRC_PREFIX)M2Dependent.h
m2/gm2-ppg-boot/$(SRC_PREFIX)%.h: $(srcdir)/m2/gm2-libs/%.def $(MCDEPS)
-test -d m2/gm2-ppg-boot || $(mkinstalldirs) m2/gm2-ppg-boot
$(MCC) -o=$@ $(srcdir)/m2/gm2-libs/$*.def
m2/gm2-ppg-boot/$(SRC_PREFIX)%.o: m2/mc-boot-ch/$(SRC_PREFIX)%.c m2/gm2-libs/gm2-libs-host.h
m2/gm2-ppg-boot/$(SRC_PREFIX)%.o: m2/mc-boot-ch/$(SRC_PREFIX)%.c m2/gm2-libs/gm2-libs-host.h $(BUILD-BOOT-PPG-H)
-test -d m2/gm2-ppg-boot || $(mkinstalldirs) m2/gm2-ppg-boot
$(CXX) -I. -I$(srcdir)/../include -I$(srcdir) -I$(srcdir)/m2/mc-boot-ch -Im2/gm2-libs $(INCLUDES) -g -c $< -o $@
m2/gm2-ppg-boot/$(SRC_PREFIX)%.o: m2/mc-boot-ch/$(SRC_PREFIX)%.cc m2/gm2-libs/gm2-libs-host.h
m2/gm2-ppg-boot/$(SRC_PREFIX)%.o: m2/mc-boot-ch/$(SRC_PREFIX)%.cc m2/gm2-libs/gm2-libs-host.h $(BUILD-BOOT-PPG-H)
-test -d m2/gm2-ppg-boot || $(mkinstalldirs) m2/gm2-ppg-boot
$(CXX) -I. -I$(srcdir)/../include -I$(srcdir) -I$(srcdir)/m2/mc-boot-ch -Im2/gm2-libs $(INCLUDES) -g -c $< -o $@
m2/gm2-ppg-boot/$(SRC_PREFIX)%.o: $(srcdir)/m2/gm2-libs/%.mod $(MCDEPS) $(BUILD-BOOT-H)
m2/gm2-ppg-boot/$(SRC_PREFIX)%.o: $(srcdir)/m2/gm2-libs/%.mod $(MCDEPS) $(BUILD-BOOT-PPG-H)
-test -d m2/gm2-ppg-boot || $(mkinstalldirs) m2/gm2-ppg-boot
$(MCC) -o=m2/gm2-ppg-boot/$(SRC_PREFIX)$*.c $(srcdir)/m2/gm2-libs/$*.mod
$(CXX) -I. -I$(srcdir)/../include -I$(srcdir) \
-Im2/gm2-ppg-boot -I$(srcdir)/m2/mc-boot -Im2/gm2-libs-boot \
-I$(srcdir)/m2/mc-boot-ch $(INCLUDES) -g -c m2/gm2-ppg-boot/$(SRC_PREFIX)$*.c -o $@
m2/gm2-ppg-boot/$(SRC_PREFIX)%.o: $(srcdir)/m2/gm2-compiler/%.mod $(MCDEPS) $(BUILD-BOOT-H)
m2/gm2-ppg-boot/$(SRC_PREFIX)%.o: $(srcdir)/m2/gm2-compiler/%.mod $(MCDEPS) $(BUILD-BOOT-PPG-H)
-test -d m2/gm2-ppg-boot || $(mkinstalldirs) m2/gm2-ppg-boot
$(MCC) -o=m2/gm2-ppg-boot/$(SRC_PREFIX)$*.c $(srcdir)/m2/gm2-compiler/$*.mod
$(CXX) -I. -I$(srcdir)/../include -I$(srcdir) \
@ -142,6 +146,51 @@ m2/gm2-auto:
# without error recovery
PG-SRC = pg.mod
PGE-DEF = ASCII.def \
Args.def \
Assertion.def \
Break.def \
COROUTINES.def \
CmdArgs.def \
Debug.def \
DynamicStrings.def \
Environment.def \
FIO.def \
FormatStrings.def \
FpuIO.def \
IO.def \
M2Dependent.def \
M2EXCEPTION.def \
M2LINK.def \
M2RTS.def \
MemUtils.def \
NumberIO.def \
PushBackInput.def \
RTExceptions.def \
RTco.def \
RTentity.def \
RTint.def \
SArgs.def \
SFIO.def \
SYSTEM.def \
Selective.def \
StdIO.def \
Storage.def \
StrCase.def \
StrIO.def \
StrLib.def \
StringConvert.def \
SysExceptions.def \
SysStorage.def \
TimeString.def \
UnixArgs.def \
dtoa.def \
errno.def \
ldtoa.def \
libc.def \
libm.def \
termios.def \
wrapc.def \
BUILD-PG-O = $(PPG-INTERFACE-C:%.c=m2/gm2-pg-boot/$(SRC_PREFIX)%.o) \
$(PPG-INTERFACE-CC:%.cc=m2/gm2-pg-boot/$(SRC_PREFIX)%.o) \
@ -149,19 +198,23 @@ BUILD-PG-O = $(PPG-INTERFACE-C:%.c=m2/gm2-pg-boot/$(SRC_PREFIX)%.o) \
$(PPG-LIB-MODS:%.mod=m2/gm2-pg-boot/$(SRC_PREFIX)%.o) \
$(PG-SRC:%.mod=m2/gm2-pg-boot/$(SRC_PREFIX)%.o)
BUILD-BOOT-PG-H: $(BUILD-BOOT-H) \
m2/gm2-pg-boot/$(SRC_PREFIX)M2RTS.h \
m2/gm2-pg-boot/$(SRC_PREFIX)M2Dependent.h
m2/gm2-pg-boot/$(SRC_PREFIX)%.h: $(srcdir)/m2/gm2-libs/%.def $(MCDEPS)
-test -d m2/gm2-pg-boot || $(mkinstalldirs) m2/gm2-pg-boot
$(MCC) -o=$@ $(srcdir)/m2/gm2-libs/$*.def
m2/gm2-pg-boot/$(SRC_PREFIX)%.o: m2/mc-boot-ch/$(SRC_PREFIX)%.c m2/gm2-libs/gm2-libs-host.h
m2/gm2-pg-boot/$(SRC_PREFIX)%.o: m2/mc-boot-ch/$(SRC_PREFIX)%.c m2/gm2-libs/gm2-libs-host.h $(BUILD-BOOT-PG-H)
-test -d m2/gm2-pg-boot || $(mkinstalldirs) m2/gm2-pg-boot
$(CXX) -I. -I$(srcdir)/../include -I$(srcdir) -I$(srcdir)/m2/mc-boot-ch -Im2/gm2-libs $(INCLUDES) -g -c $< -o $@
m2/gm2-pg-boot/$(SRC_PREFIX)%.o: m2/mc-boot-ch/$(SRC_PREFIX)%.cc m2/gm2-libs/gm2-libs-host.h
m2/gm2-pg-boot/$(SRC_PREFIX)%.o: m2/mc-boot-ch/$(SRC_PREFIX)%.cc m2/gm2-libs/gm2-libs-host.h $(BUILD-BOOT-PG-H)
-test -d m2/gm2-pg-boot || $(mkinstalldirs) m2/gm2-pg-boot
$(CXX) -I. -I$(srcdir)/../include -I$(srcdir) -I$(srcdir)/m2/mc-boot-ch -Im2/gm2-libs $(INCLUDES) -g -c $< -o $@
m2/gm2-pg-boot/$(SRC_PREFIX)%.o: $(srcdir)/m2/gm2-libs/%.mod $(MCDEPS) $(BUILD-BOOT-H)
m2/gm2-pg-boot/$(SRC_PREFIX)%.o: $(srcdir)/m2/gm2-libs/%.mod $(MCDEPS) $(BUILD-BOOT-PG-H)
-test -d m2/gm2-pg-boot || $(mkinstalldirs) m2/gm2-pg-boot
$(MCC) -o=m2/gm2-pg-boot/$(SRC_PREFIX)$*.c $(srcdir)/m2/gm2-libs/$*.mod
$(CXX) -I. -I$(srcdir)/../include -I$(srcdir) -Im2/gm2-pg-boot -I$(srcdir)/m2/mc-boot \
@ -169,13 +222,13 @@ m2/gm2-pg-boot/$(SRC_PREFIX)%.o: $(srcdir)/m2/gm2-libs/%.mod $(MCDEPS) $(BUILD-B
-Im2/gm2-libs-boot $(INCLUDES) \
-g -c m2/gm2-pg-boot/$(SRC_PREFIX)$*.c -o $@
m2/gm2-pg-boot/$(SRC_PREFIX)%.o: $(srcdir)/m2/gm2-compiler/%.mod $(MCDEPS) $(BUILD-BOOT-H)
m2/gm2-pg-boot/$(SRC_PREFIX)%.o: $(srcdir)/m2/gm2-compiler/%.mod $(MCDEPS) $(BUILD-BOOT-PG-H)
-test -d m2/gm2-pg-boot || $(mkinstalldirs) m2/gm2-pg-boot
$(MCC) -o=m2/gm2-pg-boot/$(SRC_PREFIX)$*.c $(srcdir)/m2/gm2-compiler/$*.mod
$(CXX) -I. -I$(srcdir)/../include -I$(srcdir) -Im2/mc-boot -Im2/gm2-compiler-boot -Im2/gm2-libs-boot \
-I$(srcdir)/m2/mc-boot-ch $(INCLUDES) -g -c m2/gm2-pg-boot/$(SRC_PREFIX)$*.c -o $@
m2/gm2-pg-boot/$(SRC_PREFIX)pg.o: m2/gm2-auto/pg.mod $(MCDEPS) $(BUILD-BOOT-H)
m2/gm2-pg-boot/$(SRC_PREFIX)pg.o: m2/gm2-auto/pg.mod $(MCDEPS) $(BUILD-BOOT-PG-H)
-test -d m2/gm2-pg-boot || $(mkinstalldirs) m2/gm2-pg-boot
$(MCC) -o=m2/gm2-pg-boot/$(SRC_PREFIX)pg.c m2/gm2-auto/pg.mod
$(CXX) -I. -I$(srcdir)/../include -I$(srcdir) -Im2/mc-boot -Im2/gm2-compiler-boot -Im2/gm2-libs-boot \
@ -227,6 +280,9 @@ BUILD-PGE-O = $(PPG-INTERFACE-C:%.c=m2/gm2-pge-boot/$(SRC_PREFIX)%.o) \
$(PPG-LIB-MODS:%.mod=m2/gm2-pge-boot/$(SRC_PREFIX)%.o) \
$(PGE-SRC:%.mod=m2/gm2-pge-boot/$(SRC_PREFIX)%.o)
BUILD-BOOT-PGE-H: $(BUILD-BOOT-H) $(PGE-DEF:%.def=m2/gm2-pge-boot/$(SRC_PREFIX)%.h) \
m2/gm2-pge-boot/GM2RTS.h m2/gm2-pge-boot/GM2Dependent.h
m2/gm2-auto/pge.mod: m2/pg$(exeext)
-test -d m2/gm2-auto || $(mkinstalldirs) m2/gm2-auto
$(SHELL) $(srcdir)/m2/tools-src/buildpg $(srcdir)/m2/gm2-compiler/ppg.mod pge > m2/gm2-auto/pge.bnf
@ -272,7 +328,7 @@ m2/gm2-pge-boot/$(SRC_PREFIX)wrapc.o: $(srcdir)/m2/mc-boot-ch/Gwrapc.c m2/gm2-l
-test -d m2/gm2-pge-boot || $(mkinstalldirs) m2/gm2-pge-boot
$(CXX) -I. -I$(srcdir)/../include -I$(srcdir) -I$(srcdir)/m2/mc-boot-ch -Im2/gm2-libs $(INCLUDES) -g -c $< -o $@
m2/gm2-pge-boot/$(SRC_PREFIX)SYSTEM.o: $(srcdir)/m2/mc-boot-ch/GSYSTEM.c
m2/gm2-pge-boot/$(SRC_PREFIX)SYSTEM.o: $(srcdir)/m2/mc-boot-ch/GSYSTEM.c $(BUILD-BOOT-PGE-H)
-test -d m2/gm2-pge-boot || $(mkinstalldirs) m2/gm2-pge-boot
$(CXX) -I. -I$(srcdir)/../include -I$(srcdir) -I$(srcdir)/m2/mc-boot-ch $(INCLUDES) -g -c $< -o $@
@ -280,21 +336,21 @@ m2/gm2-pge-boot/$(SRC_PREFIX)errno.o: $(srcdir)/m2/mc-boot-ch/Gerrno.c
-test -d m2/gm2-pge-boot || $(mkinstalldirs) m2/gm2-pge-boot
$(CXX) -I. -I$(srcdir)/../include -I$(srcdir) -I$(srcdir)/m2/mc-boot-ch $(INCLUDES) -g -c $< -o $@
m2/gm2-pge-boot/$(SRC_PREFIX)%.o: $(srcdir)/m2/gm2-libs/%.mod $(MCDEPS) $(BUILD-BOOT-H)
m2/gm2-pge-boot/$(SRC_PREFIX)%.o: $(srcdir)/m2/gm2-libs/%.mod $(MCDEPS) $(BUILD-BOOT-PGE-H)
-test -d m2/gm2-pge-boot || $(mkinstalldirs) m2/gm2-pge-boot
$(MCC) -o=m2/gm2-pge-boot/$(SRC_PREFIX)$*.c $(srcdir)/m2/gm2-libs/$*.mod
$(CXX) -I. -I$(srcdir)/../include -I$(srcdir) -Im2/gm2-pge-boot -I$(srcdir)/m2/mc-boot \
-I$(srcdir)/m2/mc-boot-ch -Im2/gm2-libs-boot \
$(INCLUDES) -g -c m2/gm2-pge-boot/$(SRC_PREFIX)$*.c -o $@
m2/gm2-pge-boot/$(SRC_PREFIX)%.o: $(srcdir)/m2/gm2-compiler/%.mod $(MCDEPS) $(BUILD-BOOT-H)
m2/gm2-pge-boot/$(SRC_PREFIX)%.o: $(srcdir)/m2/gm2-compiler/%.mod $(MCDEPS) $(BUILD-BOOT-PGE-H)
-test -d m2/gm2-pge-boot || $(mkinstalldirs) m2/gm2-pge-boot
$(MCC) -o=m2/gm2-pge-boot/$(SRC_PREFIX)$*.c $(srcdir)/m2/gm2-compiler/$*.mod
$(CXX) -I. -I$(srcdir)/../include -I$(srcdir) -Im2/mc-boot -Im2/gm2-compiler-boot \
-Im2/gm2-libs-boot \
-I$(srcdir)/m2/mc-boot-ch $(INCLUDES) -g -c m2/gm2-pge-boot/$(SRC_PREFIX)$*.c -o $@
m2/gm2-pge-boot/$(SRC_PREFIX)pge.o: m2/gm2-auto/pge.mod $(MCDEPS) $(BUILD-BOOT-H)
m2/gm2-pge-boot/$(SRC_PREFIX)pge.o: m2/gm2-auto/pge.mod $(MCDEPS) $(BUILD-BOOT-PGE-H)
-test -d m2/gm2-pge-boot || $(mkinstalldirs) m2/gm2-pge-boot
$(MCC) -o=m2/gm2-pge-boot/$(SRC_PREFIX)pge.c m2/gm2-auto/pge.mod
$(CXX) -I. -I$(srcdir)/../include -I$(srcdir) \
@ -409,8 +465,11 @@ MCLINK=-g # use -g -fmodules -c if you are debugging and wish to see missing
# This is only needed in maintainer mode by 'make mc-maintainer' when regenerating the C
# version of mc. We need a working Modula-2 compiler to run mc-maintainer.
GM2SYS=${HOME}/opt/lib/gcc/x86_64-pc-linux-gnu/12.0.0/m2/m2pim
GM2PATH=-I$(srcdir)/m2/mc -I$(GM2SYS) -I$(srcdir)/m2 -Im2/gm2-auto -I$(srcdir)/m2/gm2-libs -I$(srcdir)/m2/gm2-libs-iso
# GM2SYS=${HOME}/opt/lib/gcc/x86_64-pc-linux-gnu/13.0.0/m2/m2pim
GM2PATH=-I$(srcdir)/m2/mc \
-I$(srcdir)/m2 -Im2/gm2-auto \
-fm2-pathname=m2pim -I$(srcdir)/m2/gm2-libs -I$(srcdir)/m2/gm2-libs-ch \
-fm2-pathname=m2iso -I$(srcdir)/m2/gm2-libs-iso -fm2-pathname=-
mc: mc-clean mc-devel
@ -479,7 +538,8 @@ m2/boot-bin/mc-devel$(exeext): m2/mc-obj/mcp1.mod \
m2/mc-obj/mcp4.mod \
m2/mc-obj/mcp5.mod \
mcflex.c \
m2/mc-boot-ch/Gabort.o
m2/mc-boot-ch/Gabort.o \
m2/mc-boot-ch/Gm2rtsdummy.o
$(RM) -rf mc-obj
$(mkinstalldirs) mc-obj
$(CC) -I$(srcdir)/m2/mc -c -g mcflex.c -o mc-obj/mcflex.o
@ -515,7 +575,8 @@ m2/boot-bin/mc-devel$(exeext): m2/mc-obj/mcp1.mod \
$(BOOTGM2) $(MCLINK) -I. -fscaffold-static -fscaffold-main $(GM2PATH) \
-fuse-list=$(srcdir)/m2/init/mcinit $(srcdir)/m2/mc/top.mod -o mc \
m2/gm2-libs-boot/RTcodummy.o \
m2/gm2-libs-boot/dtoa.o m2/gm2-libs-boot/ldtoa.o mc-obj/*o m2/mc-boot-ch/Gabort.o
m2/gm2-libs-boot/dtoa.o m2/gm2-libs-boot/ldtoa.o mc-obj/*o \
m2/mc-boot-ch/Gabort.o m2/mc-boot-ch/Gm2rtsdummy.o
m2/boot-bin/mc-opt$(exeext): m2/mc-obj/mcp1.mod \
m2/mc-obj/mcp2.mod \
@ -525,7 +586,7 @@ m2/boot-bin/mc-opt$(exeext): m2/mc-obj/mcp1.mod \
mcflex.c
-test -d m2/boot-bin || $(mkinstalldirs) m2/boot-bin
g++ -I$(srcdir)/m2/mc -c -g mcflex.c
$(BOOTGM2) -fsources -fm2-whole-program -g -I$(srcdir)/m2/mc:$(objdir)/m2/mc-obj -I$(srcdir)/m2/gm2-libs -I$(srcdir)/m2/mc $(srcdir)/m2/mc/top.mod
$(BOOTGM2) -fsources -fm2-whole-program -g -I$(srcdir)/m2/mc -I$(objdir)/m2/mc-obj -I$(srcdir)/m2/gm2-libs -I$(srcdir)/m2/mc $(srcdir)/m2/mc/top.mod
m2/mc/decl.o: $(srcdir)/m2/mc/decl.mod
-test -d m2/mc || $(mkinstalldirs) m2/mc

45
gcc/m2/gm2-compiler/DynamicStringPath.def → gcc/m2/gm2-compiler/DynamicPath.def
View file

@ -1,4 +1,4 @@
(* DynamicStringPath.def implements a path for DynamicStrings.
(* DynamicPath.def implements a path for DynamicStrings.
Copyright (C) 2001-2023 Free Software Foundation, Inc.
Contributed by Gaius Mulley <gaius.mulley@southwales.ac.uk>.
@ -24,7 +24,7 @@ a copy of the GCC Runtime Library Exception along with this program;
see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
<http://www.gnu.org/licenses/>. *)
DEFINITION MODULE DynamicStringPath ; (*!m2iso+gm2*)
DEFINITION MODULE DynamicPath ; (*!m2iso+gm2*)
FROM DynamicStrings IMPORT String ;
@ -32,34 +32,6 @@ TYPE
PathList ;
(*
GetUserPath - returns the current UserPath.
*)
PROCEDURE GetUserPath () : PathList ;
(*
GetSystemPath - returns the current SystemPath.
*)
PROCEDURE GetSystemPath () : PathList ;
(*
SetUserPath - assigns UserPath to pl.
*)
PROCEDURE SetUserPath (pl: PathList) ;
(*
SetSystemPath - assigns SystemPath to pl.
*)
PROCEDURE SetSystemPath (pl: PathList) ;
(*
InitPathList - creates a new empty path list.
*)
@ -86,10 +58,6 @@ PROCEDURE Cons (pl: PathList; str: String) : PathList ;
(*
ConsList - concatenates path list left and right together.
It always returns NIL which should be assigned
to the callers right parameter after ConsList
has been completed signifying that right should
no longer be accessed.
*)
PROCEDURE ConsList (left, right: PathList) : PathList ;
@ -110,4 +78,11 @@ PROCEDURE Stash (VAR pl: PathList) : PathList ;
PROCEDURE FindFileName (filename: String; pl: PathList) : String ;
END DynamicStringPath.
(*
DumpPath - debugging dump of the pathlist.
*)
PROCEDURE DumpPath (name: String; pl: PathList) ;
END DynamicPath.

82
gcc/m2/gm2-compiler/DynamicStringPath.mod → gcc/m2/gm2-compiler/DynamicPath.mod
View file

@ -1,4 +1,4 @@
(* DynamicStringPath.def implements a path for DynamicStrings.
(* DynamicPath.mod implements a path for DynamicStrings.
Copyright (C) 2001-2023 Free Software Foundation, Inc.
Contributed by Gaius Mulley <gaius.mulley@southwales.ac.uk>.
@ -24,11 +24,11 @@ a copy of the GCC Runtime Library Exception along with this program;
see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
<http://www.gnu.org/licenses/>. *)
IMPLEMENTATION MODULE DynamicStringPath ; (*!m2iso+gm2*)
IMPLEMENTATION MODULE DynamicPath ; (*!m2iso+gm2*)
FROM Storage IMPORT ALLOCATE, DEALLOCATE ;
FROM DynamicStrings IMPORT InitString, ConCat, ConCatChar, char, Dup,
KillString, Length ;
KillString, Length, EqualArray ;
FROM SFIO IMPORT Exists ;
FROM FIO IMPORT StdErr ;
FROM M2Printf IMPORT fprintf0, fprintf1 ;
@ -46,51 +46,7 @@ TYPE
VAR
FreeList,
DefaultUserPath,
DefaultSystemPath: PathList ;
(*
GetUserPath - returns the current UserPath.
*)
PROCEDURE GetUserPath () : PathList ;
BEGIN
RETURN DefaultUserPath
END GetUserPath ;
(*
GetSystemPath - returns the current SystemPath.
*)
PROCEDURE GetSystemPath () : PathList ;
BEGIN
RETURN DefaultSystemPath
END GetSystemPath ;
(*
SetUserPath - assigns UserPath to pl.
*)
PROCEDURE SetUserPath (pl: PathList) ;
BEGIN
DefaultUserPath := pl ;
DumpPath ('DefaultUserPath', DefaultUserPath)
END SetUserPath ;
(*
SetSystemPath - assigns SystemPath to pl.
*)
PROCEDURE SetSystemPath (pl: PathList) ;
BEGIN
DefaultSystemPath := pl ;
DumpPath ('DefaultSystemPath', DefaultSystemPath)
END SetSystemPath ;
FreeList: PathList ;
(*
@ -148,10 +104,6 @@ END Cons ;
(*
ConsList - concatenates path list left and right together.
It always returns NIL which should be assigned
to the callers right parameter after ConsList
has been completed signifying that right should
no longer be accessed.
*)
PROCEDURE ConsList (left, right: PathList) : PathList ;
@ -241,25 +193,19 @@ END FindFileName ;
DumpPath - debugging dump of the pathlist.
*)
PROCEDURE DumpPath (name: ARRAY OF CHAR; pl: PathList) ;
PROCEDURE DumpPath (name: String; pl: PathList) ;
BEGIN
IF Debugging
THEN
fprintf0 (StdErr, name) ;
fprintf0 (StdErr, ":") ;
WHILE pl # NIL DO
fprintf0 (StdErr, " {") ;
fprintf1 (StdErr, "%s", pl^.entry) ;
fprintf0 (StdErr, "}") ;
pl := pl^.next
END ;
fprintf0 (StdErr, "\n")
END
fprintf1 (StdErr, "%s:", name) ;
WHILE pl # NIL DO
fprintf0 (StdErr, " {") ;
fprintf1 (StdErr, "%s", pl^.entry) ;
fprintf0 (StdErr, "}") ;
pl := pl^.next
END ;
fprintf0 (StdErr, "\n")
END DumpPath ;
BEGIN
DefaultSystemPath := NIL ;
DefaultUserPath := NIL ;
FreeList := NIL
END DynamicStringPath.
END DynamicPath.

46
gcc/m2/gm2-compiler/M2AsmUtil.mod
View file

@ -24,14 +24,15 @@ IMPLEMENTATION MODULE M2AsmUtil ;
FROM SFIO IMPORT WriteS ;
FROM FIO IMPORT StdOut ;
FROM DynamicStrings IMPORT String, string, ConCat, KillString, InitString, Mark, InitStringCharStar, ConCatChar ;
FROM DynamicStrings IMPORT String, string, ConCat, KillString, InitString, Mark, InitStringCharStar, ConCatChar, EqualArray ;
FROM StdIO IMPORT Write ;
FROM StrIO IMPORT WriteString ;
FROM NameKey IMPORT WriteKey, GetKey, MakeKey, makekey, KeyToCharStar ;
FROM NameKey IMPORT WriteKey, GetKey, MakeKey, makekey, KeyToCharStar, NulName ;
FROM M2Options IMPORT WholeProgram ;
FROM M2Printf IMPORT printf1 ;
FROM SymbolTable IMPORT NulSym,
GetSymName,
GetSymName, GetLibName,
GetScope,
GetBaseModule,
IsInnerModule,
@ -47,6 +48,10 @@ FROM M2Error IMPORT InternalError ;
FROM m2configure IMPORT UseUnderscoreForC ;
CONST
Debugging = FALSE ;
(*
StringToKey - returns a Name, from a string and destroys the string.
*)
@ -97,8 +102,10 @@ END GetFullScopeAsmName ;
PROCEDURE GetFullSymName (sym: CARDINAL) : Name ;
VAR
module: String ;
scope : CARDINAL ;
libname,
fullsymname,
module : String ;
scope : CARDINAL ;
BEGIN
IF IsProcedure (sym) AND IsMonoName (sym)
THEN
@ -106,7 +113,34 @@ BEGIN
ELSE
scope := GetScope (sym) ;
module := GetModulePrefix (InitString (''), sym, scope) ;
RETURN StringToKey (ConCat (module, InitStringCharStar (KeyToCharStar (GetSymName (sym)))))
fullsymname := ConCat (module, InitStringCharStar (KeyToCharStar (GetSymName (sym)))) ;
IF (IsVar (sym) OR IsProcedure (sym)) AND IsExportQualified (sym)
THEN
WHILE NOT IsDefImp (scope) DO
scope := GetScope (scope)
END ;
IF GetLibName (scope) # NulName
THEN
IF Debugging
THEN
printf1 ("before sym = %s , ", fullsymname)
END ;
libname := InitStringCharStar (KeyToCharStar (GetLibName (scope))) ;
IF NOT EqualArray (libname, '')
THEN
IF Debugging
THEN
printf1 ("libname = %s , ", libname)
END ;
fullsymname := ConCat (ConCatChar (libname, '_'), fullsymname) ;
END ;
IF Debugging
THEN
printf1 ("after sym = %s\n", fullsymname)
END
END
END ;
RETURN StringToKey (fullsymname)
END
END GetFullSymName ;

64
gcc/m2/gm2-compiler/M2Comp.mod
View file

@ -59,14 +59,17 @@ FROM M2Batch IMPORT GetSource, GetModuleNo, GetDefinitionModuleFile, GetModuleFi
FROM SymbolTable IMPORT GetSymName, IsDefImp, NulSym,
IsHiddenTypeDeclared, GetFirstUsed, GetMainModule, SetMainModule,
ResolveConstructorTypes, SanityCheckConstants, IsDefinitionForC,
IsBuiltinInModule, PutModLink, IsDefLink, IsModLink ;
IsBuiltinInModule, PutModLink, IsDefLink, IsModLink,
PutLibName ;
FROM FIO IMPORT StdErr, StdOut ;
FROM NameKey IMPORT Name, GetKey, KeyToCharStar, makekey ;
FROM M2Printf IMPORT fprintf1 ;
FROM M2Quiet IMPORT qprintf0, qprintf1, qprintf2 ;
FROM DynamicStrings IMPORT String, InitString, KillString, InitStringCharStar, Dup, Mark, string ;
FROM M2Options IMPORT Verbose ;
FROM DynamicStrings IMPORT String, InitString, KillString, InitStringCharStar, Dup, Mark, EqualArray, string ;
FROM M2Options IMPORT Verbose, GetM2Prefix ;
FROM PathName IMPORT DumpPathName ;
CONST
Debugging = FALSE ;
@ -225,6 +228,19 @@ BEGIN
END PeepInto ;
(*
qprintLibName - print the libname
*)
PROCEDURE qprintLibName (LibName: String) ;
BEGIN
IF (LibName # NIL) AND (NOT EqualArray (LibName, ''))
THEN
qprintf1 (' [%s]', LibName)
END
END qprintLibName ;
(*
DoPass0 -
*)
@ -236,6 +252,7 @@ VAR
i : CARDINAL ;
SymName,
FileName,
LibName,
PPSource: String ;
BEGIN
P0Init ;
@ -251,27 +268,34 @@ BEGIN
i := 1 ;
Sym := GetModuleNo(i) ;
qprintf1('Compiling: %s\n', PPSource) ;
IF Debugging
THEN
DumpPathName ('DoPass0')
END ;
IF Verbose
THEN
fprintf1(StdOut, 'Compiling: %s\n', PPSource) ;
fprintf1 (StdOut, 'Compiling: %s\n', PPSource)
END ;
qprintf0('Pass 0: lexical analysis, parsing, modules and associated filenames\n') ;
WHILE Sym#NulSym DO
SymName := InitStringCharStar(KeyToCharStar(GetSymName(Sym))) ;
IF IsDefImp(Sym)
SymName := InitStringCharStar (KeyToCharStar (GetSymName (Sym))) ;
IF IsDefImp (Sym)
THEN
IF FindSourceDefFile(SymName, FileName)
LibName := NIL ;
IF FindSourceDefFile (SymName, FileName, LibName)
THEN
ModuleType := Definition ;
IF OpenSource(AssociateDefinition(PreprocessModule(FileName, FALSE), Sym))
IF OpenSource (AssociateDefinition (PreprocessModule (FileName, FALSE), Sym))
THEN
IF NOT P0SyntaxCheck.CompilationUnit()
IF NOT P0SyntaxCheck.CompilationUnit ()
THEN
WriteFormat0('compilation failed') ;
WriteFormat0 ('compilation failed') ;
CloseSource ;
RETURN
END ;
qprintf2 (' Module %-20s : %s', SymName, FileName) ;
qprintLibName (LibName) ;
PutLibName (Sym, makekey (string (LibName))) ;
IF IsDefinitionForC (Sym)
THEN
qprintf0 (' (for C)')
@ -298,13 +322,17 @@ BEGIN
IF (Main=Sym) OR NeedToParseImplementation(Sym)
THEN
(* only need to read implementation module if hidden types are declared or it is the main module *)
LibName := NIL ;
IF Main=Sym
THEN
FileName := Dup (PPSource)
FileName := Dup (PPSource) ;
LibName := InitStringCharStar (GetM2Prefix ()) ;
PutLibName (Sym, makekey (string (LibName)))
ELSE
IF FindSourceModFile (SymName, FileName)
IF FindSourceModFile (SymName, FileName, LibName)
THEN
FileName := PreprocessModule (FileName, FALSE)
FileName := PreprocessModule (FileName, FALSE) ;
PutLibName (Sym, makekey (string (LibName)))
END
END ;
IF FileName#NIL
@ -318,6 +346,7 @@ BEGIN
RETURN
END ;
qprintf2 (' Module %-20s : %s', SymName, FileName) ;
qprintLibName (LibName) ;
IF IsModLink (Sym)
THEN
qprintf0 (' (linking)')
@ -343,9 +372,13 @@ BEGIN
THEN
(* The implementation is only useful if -fgen-module-list= is
used and we do not insist upon it. *)
IF FindSourceModFile (SymName, FileName)
LibName := NIL ;
IF FindSourceModFile (SymName, FileName, LibName)
THEN
qprintf2 (' Module %-20s : %s (linking)\n', SymName, FileName) ;
PutLibName (Sym, makekey (string (LibName))) ;
qprintf2 (' Module %-20s : %s' , SymName, FileName) ;
qprintLibName (LibName) ;
qprintf0 (' (linking)\n') ;
IF OpenSource (AssociateModule (PreprocessModule (FileName, FALSE), Sym))
THEN
PutModLink (Sym, TRUE) ; (* This source is only used to determine link time info. *)
@ -362,6 +395,7 @@ BEGIN
END ;
SymName := KillString (SymName) ;
FileName := KillString (FileName) ;
LibName := KillString (LibName) ;
INC (i) ;
Sym := GetModuleNo (i)
END ;

12
gcc/m2/gm2-compiler/M2Graph.mod
View file

@ -29,8 +29,8 @@ FROM StrIO IMPORT WriteString, WriteLn ;
FROM NameKey IMPORT Name, WriteKey ;
FROM Lists IMPORT InitList, KillList, IncludeItemIntoList, RemoveItemFromList ;
FROM Indexing IMPORT Index, HighIndice, IncludeIndiceIntoIndex, InitIndex, KillIndex, GetIndice ;
FROM M2Printf IMPORT printf0, printf1, printf2 ;
FROM SymbolTable IMPORT GetSymName, IsDefinitionForC, IsModule ;
FROM M2Printf IMPORT printf0, printf1, printf2, printf3 ;
FROM SymbolTable IMPORT GetSymName, GetLibName, IsDefinitionForC, IsModule ;
CONST
@ -189,18 +189,20 @@ END SortGraph ;
PROCEDURE resolveImports (sorted: List; nptr: node) ;
VAR
i, n: CARDINAL ;
name: Name ;
i, n: CARDINAL ;
libname,
name : Name ;
BEGIN
IF nptr^.nstate = initial
THEN
nptr^.nstate := started ;
name := GetSymName (nptr^.moduleSym) ;
libname := GetLibName (nptr^.moduleSym) ;
i := 1 ;
n := HighIndice (nptr^.deps) ;
IF Debugging
THEN
printf2 ("resolving %a %d dependents\n", name, n)
printf3 ("resolving %a [%a] %d dependents\n", name, libname, n)
END ;
WHILE i <= n DO
resolveImports (sorted, GetIndice (nptr^.deps, i)) ;

32
gcc/m2/gm2-compiler/M2Options.def
View file

@ -94,7 +94,8 @@ EXPORT QUALIFIED SetReturnCheck, SetNilCheck, SetCaseCheck,
SetRuntimeModuleOverride, GetRuntimeModuleOverride,
SetGenModuleList, GetGenModuleFilename, SharedFlag,
SetB, GetB, SetMD, GetMD, SetMMD, GetMMD, SetObj, GetObj,
GetMQ, SetMQ ;
GetMQ, SetMQ, SetM2Prefix, GetM2Prefix,
SetM2PathName, GetM2PathName ;
VAR
@ -177,6 +178,35 @@ VAR
Coding,
Profiling : BOOLEAN ;
(*
SetM2Prefix - assign arg to M2Prefix.
*)
PROCEDURE SetM2Prefix (arg: ADDRESS) ;
(*
GetM2Prefix - return M2Prefix as a C string.
*)
PROCEDURE GetM2Prefix () : ADDRESS ;
(*
SetM2PathName - assign arg to M2PathName.
*)
PROCEDURE SetM2PathName (arg: ADDRESS) ;
(*
GetM2PathName - return M2PathName as a C string.
*)
PROCEDURE GetM2PathName () : ADDRESS ;
(*
SetPPOnly - set the PPonly to value (on E, M, MM).
*)

61
gcc/m2/gm2-compiler/M2Options.mod
View file

@ -25,7 +25,7 @@ IMPLEMENTATION MODULE M2Options ;
IMPORT CmdArgs ;
FROM SArgs IMPORT GetArg, Narg ;
FROM M2Search IMPORT SetDefExtension, SetModExtension ;
FROM DynamicStringPath IMPORT Cons, GetUserPath, SetUserPath, Cons ;
FROM PathName IMPORT DumpPathName, AddInclude ;
FROM M2Printf IMPORT printf0, printf1, fprintf1 ;
FROM FIO IMPORT StdErr ;
FROM libc IMPORT exit ;
@ -33,6 +33,7 @@ FROM Debug IMPORT Halt ;
FROM m2linemap IMPORT location_t ;
FROM m2configure IMPORT FullPathCPP ;
FROM DynamicStrings IMPORT String, Length, InitString, Mark, Slice, EqualArray,
InitStringCharStar, ConCatChar, ConCat, KillString,
Dup, string,
@ -51,8 +52,11 @@ FROM DynamicStrings IMPORT String, Length, InitString, Mark, Slice, EqualArray,
CONST
Debugging = FALSE ;
DefaultRuntimeModuleOverride = "m2iso:RTentity,m2iso:Storage,m2iso:SYSTEM,m2iso:M2RTS,m2iso:RTExceptions,m2iso:IOLink" ;
VAR
M2Prefix,
M2PathName,
Barg,
MDarg,
MMDarg,
@ -116,6 +120,49 @@ END DSdbExit ;
*)
(*
SetM2Prefix - assign arg to M2Prefix.
*)
PROCEDURE SetM2Prefix (arg: ADDRESS) ;
BEGIN
M2Prefix := KillString (M2Prefix) ;
M2Prefix := InitStringCharStar (arg)
END SetM2Prefix ;
(*
GetM2Prefix - return M2Prefix as a C string.
*)
PROCEDURE GetM2Prefix () : ADDRESS ;
BEGIN
RETURN string (M2Prefix)
END GetM2Prefix ;
(*
SetM2PathName - assign arg to M2PathName.
*)
PROCEDURE SetM2PathName (arg: ADDRESS) ;
BEGIN
M2PathName := KillString (M2PathName) ;
M2PathName := InitStringCharStar (arg) ;
(* fprintf1 (StdErr, "M2PathName = %s\n", M2PathName) *)
END SetM2PathName ;
(*
GetM2PathName - return M2PathName as a C string.
*)
PROCEDURE GetM2PathName () : ADDRESS ;
BEGIN
RETURN string (M2PathName)
END GetM2PathName ;
(*
SetB - assigns Barg to arg.
*)
@ -900,12 +947,12 @@ PROCEDURE SetSearchPath (arg: ADDRESS) ;
VAR
s: String ;
BEGIN
s := InitStringCharStar(arg) ;
s := InitStringCharStar (arg) ;
AddInclude (M2PathName, s) ;
IF Debugging
THEN
fprintf1 (StdErr, "M2Search.SetSearchPath setting search path to: %s\n", s)
DumpPathName ("path name entries: ")
END ;
SetUserPath (Cons (GetUserPath (), s)) ;
s := KillString (s)
END SetSearchPath ;
@ -1315,7 +1362,7 @@ END SetShared ;
BEGIN
cflag := FALSE ; (* -c. *)
RuntimeModuleOverride := NIL ;
RuntimeModuleOverride := InitString (DefaultRuntimeModuleOverride) ;
CppArgs := InitString ('') ;
Pim := TRUE ;
Pim2 := FALSE ;
@ -1382,5 +1429,7 @@ BEGIN
MMDarg := NIL ;
MQarg := NIL ;
SaveTempsDir := NIL ;
DumpDir := NIL
DumpDir := NIL ;
M2Prefix := InitString ('') ;
M2PathName := InitString ('')
END M2Options.

47
gcc/m2/gm2-compiler/M2Quads.mod
View file

@ -126,7 +126,7 @@ FROM SymbolTable IMPORT ModeOfAddr, GetMode, PutMode, GetSymName, IsUnknown,
GetUnboundedHighOffset,
ForeachFieldEnumerationDo, ForeachLocalSymDo,
GetExported, PutImported, GetSym,
GetExported, PutImported, GetSym, GetLibName,
IsUnused,
NulSym ;
@ -2259,7 +2259,8 @@ END SafeRequestSym ;
(*
callRequestDependant - create a call:
RequestDependant (GetSymName (modulesym), GetSymName (depModuleSym));
RequestDependant (GetSymName (modulesym), GetLibName (modulesym),
GetSymName (depModuleSym), GetLibName (depModuleSym));
*)
PROCEDURE callRequestDependant (tokno: CARDINAL;
@ -2273,17 +2274,28 @@ BEGIN
PushT (1) ;
BuildAdrFunction ;
PushTF (Adr, Address) ;
PushTtok (MakeConstLitString (tokno, GetLibName (moduleSym)), tokno) ;
PushT (1) ;
BuildAdrFunction ;
IF depModuleSym = NulSym
THEN
PushTF (Nil, Address) ;
PushTF (Nil, Address)
ELSE
PushTF (Adr, Address) ;
PushTtok (MakeConstLitString (tokno, GetSymName (depModuleSym)), tokno) ;
PushT (1) ;
BuildAdrFunction ;
PushTF (Adr, Address) ;
PushTtok (MakeConstLitString (tokno, GetLibName (depModuleSym)), tokno) ;
PushT (1) ;
BuildAdrFunction
END ;
PushT (2) ;
PushT (4) ;
BuildProcedureCall (tokno)
END callRequestDependant ;
@ -2344,8 +2356,8 @@ END ForeachImportedModuleDo ;
static void
dependencies (void)
{
M2RTS_RequestDependant (module_name, "b");
M2RTS_RequestDependant (module_name, NULL);
M2RTS_RequestDependant (module_name, libname, "b", "b libname");
M2RTS_RequestDependant (module_name, libname, NULL, NULL);
}
*)
@ -2519,7 +2531,7 @@ BEGIN
(* int
_M2_init (int argc, char *argv[], char *envp[])
{
M2RTS_ConstructModules (module_name, argc, argv, envp);
M2RTS_ConstructModules (module_name, libname, argc, argv, envp);
} *)
PushT (initFunction) ;
BuildProcedureStart ;
@ -2549,10 +2561,15 @@ BEGIN
PushT(1) ;
BuildAdrFunction ;
PushTF(Adr, Address) ;
PushTtok (MakeConstLitString (tok, GetLibName (moduleSym)), tok) ;
PushT(1) ;
BuildAdrFunction ;
PushTtok (SafeRequestSym (tok, MakeKey ("argc")), tok) ;
PushTtok (SafeRequestSym (tok, MakeKey ("argv")), tok) ;
PushTtok (SafeRequestSym (tok, MakeKey ("envp")), tok) ;
PushT (4) ;
PushT (5) ;
BuildProcedureCall (tok) ;
END
ELSIF ScaffoldStatic
@ -2604,10 +2621,15 @@ BEGIN
PushT(1) ;
BuildAdrFunction ;
PushTF(Adr, Address) ;
PushTtok (MakeConstLitString (tok, GetLibName (moduleSym)), tok) ;
PushT(1) ;
BuildAdrFunction ;
PushTtok (SafeRequestSym (tok, MakeKey ("argc")), tok) ;
PushTtok (SafeRequestSym (tok, MakeKey ("argv")), tok) ;
PushTtok (SafeRequestSym (tok, MakeKey ("envp")), tok) ;
PushT (4) ;
PushT (5) ;
BuildProcedureCall (tok)
END
ELSIF ScaffoldStatic
@ -2630,7 +2652,7 @@ END BuildM2FiniFunction ;
void
ctorFunction ()
{
M2RTS_RegisterModule (GetSymName (moduleSym),
M2RTS_RegisterModule (GetSymName (moduleSym), GetLibName (moduleSym),
init, fini, dependencies);
}
*)
@ -2663,10 +2685,15 @@ BEGIN
PushT (1) ;
BuildAdrFunction ;
PushTF (Adr, Address) ;
PushTtok (MakeConstLitString (tok, GetLibName (moduleSym)), tok) ;
PushT (1) ;
BuildAdrFunction ;
PushTtok (init, tok) ;
PushTtok (fini, tok) ;
PushTtok (dep, tok) ;
PushT (4) ;
PushT (5) ;
BuildProcedureCall (tok)
END ;
EndScope ;

34
gcc/m2/gm2-compiler/M2Scaffold.mod
View file

@ -35,7 +35,8 @@ FROM SymbolTable IMPORT NulSym, MakeProcedure, PutFunction,
GetSymName, StartScope, EndScope,
GetModuleDefImportStatementList,
GetModuleModImportStatementList,
GetImportModule, GetImportStatementList ;
GetImportModule, GetImportStatementList,
PutLibName ;
FROM NameKey IMPORT NulName, Name, MakeKey, makekey, KeyToCharStar ;
FROM M2Base IMPORT Integer, Cardinal ;
@ -44,9 +45,11 @@ FROM M2LexBuf IMPORT GetTokenNo ;
FROM Assertion IMPORT Assert ;
FROM Lists IMPORT List, InitList, IncludeItemIntoList, NoOfItemsInList, GetItemFromList, KillList, IsItemInList ;
FROM M2MetaError IMPORT MetaErrorT0, MetaErrorStringT0 ;
FROM M2Search IMPORT FindSourceDefFile ;
FROM SFIO IMPORT OpenToWrite, WriteS, ReadS, OpenToRead, Exists ;
FROM FIO IMPORT File, EOF, IsNoError, Close ;
FROM FormatStrings IMPORT Sprintf1 ;
FROM M2Options IMPORT GetUselist, ScaffoldStatic, ScaffoldDynamic, GenModuleList,
GetGenModuleFilename, GetUselistFilename, GetUselist, cflag,
@ -84,14 +87,14 @@ VAR
static void _M2_init (int argc, char *argv[], char *envp[])
{
M2RTS_ConstructModules (module_name, argc, argv, envp);
M2RTS_ConstructModules (module_name, libname, argc, argv, envp);
}
static void _M2_fini (int argc, char *argv[], char *envp[])
{
M2RTS_Terminate ();
M2RTS_DeconstructModules (module_name, argc, argv, envp);
M2RTS_DeconstructModules (module_name, libname, argc, argv, envp);
}
@ -244,16 +247,29 @@ END PopulateCtorArray ;
PROCEDURE LookupModuleSym (tok: CARDINAL; name: Name) : CARDINAL ;
VAR
sym: CARDINAL ;
sym : CARDINAL ;
FileName,
LibName : String ;
BEGIN
sym := Get (name) ;
IF sym = NulSym
THEN
sym := MakeDefImp (tok, name)
END ;
IF sym # GetMainModule ()
THEN
PutModuleCtorExtern (tok, sym, NOT WholeProgram)
LibName := NIL ;
FileName := NIL ;
IF FindSourceDefFile (InitStringCharStar (KeyToCharStar (name)),
FileName, LibName)
THEN
sym := MakeDefImp (tok, name) ;
PutLibName (sym, makekey (string (LibName))) ;
IF sym # GetMainModule ()
THEN
PutModuleCtorExtern (tok, sym, NOT WholeProgram)
END
ELSE
MetaErrorStringT0 (tok,
Sprintf1 (InitString ('the definition module file for {%%1a} cannot be found'),
name))
END
END ;
RETURN sym
END LookupModuleSym ;

10
gcc/m2/gm2-compiler/M2Search.def
View file

@ -42,11 +42,13 @@ FROM DynamicStrings IMPORT String ;
FullPath will be totally overwritten and should
not be initialized by InitString before this function
is called.
FullPath is set to NIL if this function returns FALSE.
FindSourceFile sets FullPath to a new string if successful.
The string FileName is not altered.
*)
PROCEDURE FindSourceFile (FileName: String;
VAR FullPath: String) : BOOLEAN ;
VAR FullPath, named: String) : BOOLEAN ;
(*
@ -56,7 +58,7 @@ PROCEDURE FindSourceFile (FileName: String;
then FALSE is returned and FullPath is set to NIL.
*)
PROCEDURE FindSourceDefFile (Stem: String; VAR FullPath: String) : BOOLEAN ;
PROCEDURE FindSourceDefFile (Stem: String; VAR FullPath, named: String) : BOOLEAN ;
(*
@ -66,7 +68,7 @@ PROCEDURE FindSourceDefFile (Stem: String; VAR FullPath: String) : BOOLEAN ;
then FALSE is returned and FullPath is set to NIL.
*)
PROCEDURE FindSourceModFile (Stem: String; VAR FullPath: String) : BOOLEAN ;
PROCEDURE FindSourceModFile (Stem: String; VAR FullPath, named: String) : BOOLEAN ;
(*
@ -87,4 +89,6 @@ PROCEDURE SetDefExtension (ext: String) ;
PROCEDURE SetModExtension (ext: String) ;
END M2Search.

40
gcc/m2/gm2-compiler/M2Search.mod
View file

@ -24,7 +24,7 @@ IMPLEMENTATION MODULE M2Search ;
FROM M2FileName IMPORT CalculateFileName ;
FROM Assertion IMPORT Assert ;
FROM DynamicStringPath IMPORT GetUserPath, GetSystemPath, FindFileName ;
FROM PathName IMPORT FindNamedPathFile ;
FROM DynamicStrings IMPORT InitString, InitStringChar,
KillString, ConCat, ConCatChar, Index, Slice,
@ -55,7 +55,9 @@ VAR
(*
doDSdbEnter - called when compiled with -fcpp to enable runtime garbage
collection debugging.
*)
(*
PROCEDURE doDSdbEnter ;
BEGIN
PushAllocation
@ -67,7 +69,9 @@ END doDSdbEnter ;
doDSdbExit - called when compiled with -fcpp to enable runtime garbage
collection debugging. The parameter string s is exempt from
garbage collection analysis.
*)
(*
PROCEDURE doDSdbExit (s: String) ;
BEGIN
(* Check to see whether no strings have been lost since the PushAllocation. *)
@ -120,17 +124,13 @@ END DSdbExit ;
is called.
FullPath is set to NIL if this function returns FALSE.
FindSourceFile sets FullPath to a new string if successful.
The string, FileName, is not altered.
The string FileName is not altered.
*)
PROCEDURE FindSourceFile (FileName: String;
VAR FullPath: String) : BOOLEAN ;
VAR FullPath, named: String) : BOOLEAN ;
BEGIN
FullPath := FindFileName (FileName, GetUserPath ()) ;
IF FullPath = NIL
THEN
FullPath := FindFileName (FileName, GetSystemPath ())
END ;
FullPath := FindNamedPathFile (FileName, named) ;
RETURN FullPath # NIL
END FindSourceFile ;
@ -142,22 +142,22 @@ END FindSourceFile ;
then FALSE is returned and FullPath is set to NIL.
*)
PROCEDURE FindSourceDefFile (Stem: String; VAR FullPath: String) : BOOLEAN ;
PROCEDURE FindSourceDefFile (Stem: String; VAR FullPath, named: String) : BOOLEAN ;
VAR
f: String ;
BEGIN
IF Def # NIL
THEN
f := CalculateFileName (Stem, Def) ;
IF FindSourceFile (f, FullPath)
IF FindSourceFile (f, FullPath, named)
THEN
RETURN TRUE
END ;
f := KillString (f)
END ;
(* Try the GNU Modula-2 default extension. *)
f := CalculateFileName (Stem, Mark(InitString ('def'))) ;
RETURN FindSourceFile (f, FullPath)
f := CalculateFileName (Stem, Mark (InitString ('def'))) ;
RETURN FindSourceFile (f, FullPath, named)
END FindSourceDefFile ;
@ -168,22 +168,22 @@ END FindSourceDefFile ;
then FALSE is returned and FullPath is set to NIL.
*)
PROCEDURE FindSourceModFile (Stem: String; VAR FullPath: String) : BOOLEAN ;
PROCEDURE FindSourceModFile (Stem: String; VAR FullPath, named: String) : BOOLEAN ;
VAR
f: String ;
BEGIN
IF Mod#NIL
THEN
f := CalculateFileName (Stem, Mod) ;
IF FindSourceFile (f, FullPath)
IF FindSourceFile (f, FullPath, named)
THEN
RETURN TRUE
END ;
f := KillString (f)
END ;
(* Try the GNU Modula-2 default extension. *)
f := CalculateFileName (Stem, Mark(InitString ('mod'))) ;
RETURN FindSourceFile (f, FullPath)
f := CalculateFileName (Stem, Mark (InitString ('mod'))) ;
RETURN FindSourceFile (f, FullPath, named)
END FindSourceModFile ;
@ -195,8 +195,8 @@ END FindSourceModFile ;
PROCEDURE SetDefExtension (ext: String) ;
BEGIN
Def := KillString(Def) ;
Def := Dup(ext)
Def := KillString (Def) ;
Def := Dup (ext)
END SetDefExtension ;
@ -208,8 +208,8 @@ END SetDefExtension ;
PROCEDURE SetModExtension (ext: String) ;
BEGIN
Mod := KillString(Mod) ;
Mod := Dup(ext)
Mod := KillString (Mod) ;
Mod := Dup (ext)
END SetModExtension ;

104
gcc/m2/gm2-compiler/PathName.def Normal file
View file

@ -0,0 +1,104 @@
DEFINITION MODULE PathName ;
(*
Title : PathName
Author : Gaius Mulley
System : GNU Modula-2
Date : Wed Feb 8 09:59:46 2023
Revision : $Version$
Description: maintains a dictionary of named paths.
*)
FROM DynamicStrings IMPORT String ;
FROM DynamicPath IMPORT PathList ;
TYPE
NamedPath ;
(*
FindNamedPathFile - returns NIL if a file cannot be found otherwise
it returns the path including the filename.
It also returns the name of the path.
*)
PROCEDURE FindNamedPathFile (filename: String; VAR name: String) : String ;
(*
AddInclude - adds include path to the named path. If named path
is the same as the previous call then the include path
is appended to the named path PathList otherwise a new
named path is created and placed at the end of the
named path list.
However if named is NIL or empty string then this is treated
as a user path and it will be appended to the first user
named list entry. The user entry will always be the
first node in the dictionary of named paths.
*)
PROCEDURE AddInclude (named, directory: String) ;
(*
InitNamedPath - creates a new path name with an associated pathlist.
*)
PROCEDURE InitNamedPath (name: String; pl: PathList) : NamedPath ;
(*
KillNamedPath - places list np onto the freelist.
Postcondition: np will be NIL.
*)
PROCEDURE KillNamedPath (VAR np: NamedPath) ;
(*
Cons - appends pl to the end of a named path.
If np is NIL a new list is created and returned
containing named and pl.
*)
PROCEDURE Cons (np: NamedPath; named: String; pl: PathList) : NamedPath ;
(*
ConsList - concatenates named path left and right together.
*)
PROCEDURE ConsList (left, right: NamedPath) : NamedPath ;
(*
Stash - returns np before setting np to NIL.
*)
PROCEDURE Stash (VAR np: NamedPath) : NamedPath ;
(*
SetNamedPath - assigns the named path to the default path.
*)
PROCEDURE SetNamedPath (named: NamedPath) ;
(*
GetNamedPath - returns the default named path.
*)
PROCEDURE GetNamedPath () : NamedPath ;
(*
DumpPathName - display the dictionary of names and all path entries.
*)
PROCEDURE DumpPathName (name: ARRAY OF CHAR) ;
END PathName.

279
gcc/m2/gm2-compiler/PathName.mod Normal file
View file

@ -0,0 +1,279 @@
IMPLEMENTATION MODULE PathName ;
FROM Storage IMPORT ALLOCATE, DEALLOCATE ;
FROM DynamicStrings IMPORT InitString, ConCat, ConCatChar, char, Dup,
KillString, Length, EqualArray, Equal, Mark ;
FROM SFIO IMPORT Exists ;
FROM FIO IMPORT StdErr ;
FROM M2Printf IMPORT fprintf0, fprintf1, fprintf2 ;
FROM FormatStrings IMPORT Sprintf1 ;
FROM DynamicPath IMPORT InitPathList, FindFileName ;
IMPORT DynamicPath ;
CONST
Debugging = FALSE ;
TYPE
NamedPath = POINTER TO RECORD
pathList: PathList ;
name : String ;
tail,
next : NamedPath ;
END ;
VAR
FreeList,
NamedPathHead: NamedPath ;
(*
AddSystem -
*)
PROCEDURE AddSystem (named, directory: String) ;
BEGIN
IF NamedPathHead = NIL
THEN
(* Empty dictionary add single entry. *)
SetNamedPath (InitNamedPath (named, InitPathList (directory)))
ELSIF Equal (NamedPathHead^.tail^.name, named)
THEN
NamedPathHead^.tail^.pathList := DynamicPath.Cons (NamedPathHead^.tail^.pathList,
directory)
ELSE
SetNamedPath (ConsList (NamedPathHead,
InitNamedPath (named, InitPathList (directory))))
END
END AddSystem ;
(*
AddUser -
*)
PROCEDURE AddUser (named, directory: String) ;
BEGIN
IF NamedPathHead = NIL
THEN
(* Empty dictionary add single entry. *)
SetNamedPath (InitNamedPath (named, InitPathList (directory)))
ELSIF EqualArray (NamedPathHead^.name, '')
THEN
(* Found user node. *)
NamedPathHead^.pathList := DynamicPath.Cons (NamedPathHead^.pathList,
directory)
ELSE
(* No user node yet, so we will create one. *)
NamedPathHead := ConsList (InitNamedPath (named, InitPathList (directory)),
NamedPathHead) ;
SetNamedPath (NamedPathHead)
END
END AddUser ;
(*
AddInclude - adds include path to the named path. If named path
is the same as the previous call then the include path
is appended to the named path PathList otherwise a new
named path is created and placed at the end of the
named path list.
*)
PROCEDURE AddInclude (named, directory: String) ;
BEGIN
IF Debugging
THEN
fprintf2 (StdErr, "named = %s, directory =%s\n",
named, directory)
END ;
IF (named = NIL) OR EqualArray (named, '')
THEN
AddUser (named, directory) ;
IF Debugging
THEN
DumpPathName ('User pathname')
END
ELSE
AddSystem (named, directory) ;
IF Debugging
THEN
DumpPathName ('System pathname')
END
END
END AddInclude ;
(*
SetNamedPath - assigns the named path to the default path.
*)
PROCEDURE SetNamedPath (named: NamedPath) ;
BEGIN
NamedPathHead := named
END SetNamedPath ;
(*
GetNamedPath - returns the default named path.
*)
PROCEDURE GetNamedPath () : NamedPath ;
BEGIN
RETURN NamedPathHead
END GetNamedPath ;
(*
KillNamedPath - places list np onto the freelist.
Postcondition: np will be NIL.
*)
PROCEDURE KillNamedPath (VAR np: NamedPath) ;
BEGIN
IF np # NIL
THEN
np^.tail^.next := FreeList ;
FreeList := np ;
np := NIL
END
END KillNamedPath ;
(*
ConsList - concatenates named path left and right together.
*)
PROCEDURE ConsList (left, right: NamedPath) : NamedPath ;
BEGIN
IF right # NIL
THEN
left^.tail^.next := right ;
left^.tail := right^.tail
END ;
RETURN left
END ConsList ;
(*
Cons - appends pl to the end of a named path.
If np is NIL a new list is created and returned
containing named and pl.
*)
PROCEDURE Cons (np: NamedPath; named: String; pl: PathList) : NamedPath ;
BEGIN
IF np = NIL
THEN
np := InitNamedPath (named, pl)
ELSE
np := ConsList (np, InitNamedPath (named, pl))
END ;
RETURN np
END Cons ;
(*
Stash - returns np before setting np to NIL.
*)
PROCEDURE Stash (VAR np: NamedPath) : NamedPath ;
VAR
old: NamedPath ;
BEGIN
old := np ;
np := NIL ;
RETURN old
END Stash ;
(*
InitNamedPath - creates a new path name with an associated pathlist.
*)
PROCEDURE InitNamedPath (name: String; pl: PathList) : NamedPath ;
VAR
np: NamedPath ;
BEGIN
NEW (np) ;
IF np = NIL
THEN
HALT
ELSE
np^.pathList := pl ;
np^.name := Dup (name) ;
np^.next := NIL ;
np^.tail := np
END ;
RETURN np
END InitNamedPath ;
(*
FindNamedPathFile - Post-condition: returns NIL if a file cannot be found otherwise
it returns the path including the filename.
It also returns a new string the name of the path.
Pre-condition: if name = NIL then it searches
user path first, followed by any
named path.
elsif name = ''
then
search user path
else
search named path
fi
*)
PROCEDURE FindNamedPathFile (filename: String; VAR name: String) : String ;
VAR
foundFile: String ;
np : NamedPath ;
BEGIN
np := NamedPathHead ;
WHILE np # NIL DO
IF (name = NIL) OR Equal (np^.name, name)
THEN
foundFile := FindFileName (filename, np^.pathList) ;
IF foundFile # NIL
THEN
name := Dup (np^.name) ;
RETURN foundFile
END
END ;
np := np^.next
END ;
name := NIL ;
RETURN NIL
END FindNamedPathFile ;
(*
DumpPathName - display the dictionary of names and all path entries.
*)
PROCEDURE DumpPathName (name: ARRAY OF CHAR) ;
VAR
np : NamedPath ;
leader: String ;
BEGIN
fprintf0 (StdErr, name) ;
fprintf0 (StdErr, " = {\n") ;
np := NamedPathHead ;
WHILE np # NIL DO
leader := Sprintf1 (Mark (InitString (" %s")), np^.name) ;
DynamicPath.DumpPath (leader, np^.pathList) ;
leader := KillString (leader) ;
np := np^.next
END ;
fprintf0 (StdErr, "}\n")
END DumpPathName ;
BEGIN
NamedPathHead := NIL ;
FreeList := NIL
END PathName.

17
gcc/m2/gm2-compiler/SymbolTable.def
View file

@ -336,6 +336,7 @@ EXPORT QUALIFIED NulSym,
PutModuleContainsBuiltin, IsBuiltinInModule,
HasVarParameters,
GetErrorScope,
GetLibName, PutLibName,
IsSizeSolved,
IsOffsetSolved,
@ -588,7 +589,21 @@ PROCEDURE MakeProcedure (tok: CARDINAL; ProcedureName: Name) : CARDINAL ;
MakeProcedureCtorExtern - creates an extern ctor procedure
*)
PROCEDURE MakeProcedureCtorExtern (tokenno: CARDINAL; modulename: Name) : CARDINAL ;
PROCEDURE MakeProcedureCtorExtern (tokenno: CARDINAL; libname, modulename: Name) : CARDINAL ;
(*
PutLibName - places libname into defimp or module sym.
*)
PROCEDURE PutLibName (sym: CARDINAL; libname: Name) ;
(*
GetLibName - returns libname associated with a defimp or module sym.
*)
PROCEDURE GetLibName (sym: CARDINAL) : Name ;
(*

87
gcc/m2/gm2-compiler/SymbolTable.mod
View file

@ -615,6 +615,7 @@ TYPE
RECORD
name : Name ; (* Index into name array, name *)
(* of record field. *)
libname : Name ; (* Library (dialect) with module *)
ctors : ModuleCtor ; (* All the ctor functions. *)
DefListOfDep,
ModListOfDep : List ; (* Vector of SymDependency. *)
@ -714,6 +715,7 @@ TYPE
RECORD
name : Name ; (* Index into name array, name *)
(* of record field. *)
libname : Name ; (* Library (dialect) with module *)
ctors : ModuleCtor ; (* All the ctor functions. *)
ModListOfDep : List ; (* Vector of SymDependency. *)
LocalSymbols : SymbolTree ; (* The LocalSymbols hold all the *)
@ -3030,11 +3032,11 @@ END IsImplicityExported ;
MakeProcedureCtorExtern - creates an extern ctor procedure
*)
PROCEDURE MakeProcedureCtorExtern (tokenno: CARDINAL; modulename: Name) : CARDINAL ;
PROCEDURE MakeProcedureCtorExtern (tokenno: CARDINAL; libname, modulename: Name) : CARDINAL ;
VAR
ctor: CARDINAL ;
BEGIN
ctor := MakeProcedure (tokenno, GenName ('_M2_', modulename, '_ctor')) ;
ctor := MakeProcedure (tokenno, GenName (libname, '_M2_', modulename, '_ctor')) ;
PutExtern (ctor, TRUE) ;
RETURN ctor
END MakeProcedureCtorExtern ;
@ -3044,12 +3046,13 @@ END MakeProcedureCtorExtern ;
GenName - returns a new name consisting of pre, name, post concatenation.
*)
PROCEDURE GenName (pre: ARRAY OF CHAR; name: Name; post: ARRAY OF CHAR) : Name ;
PROCEDURE GenName (libname: Name; pre: ARRAY OF CHAR; name: Name; post: ARRAY OF CHAR) : Name ;
VAR
str : String ;
result: Name ;
BEGIN
str := InitString (pre) ;
str := InitStringCharStar (KeyToCharStar (libname)) ;
str := ConCat (str, Mark (InitString (pre))) ;
str := ConCat (str, Mark (InitStringCharStar (KeyToCharStar (name)))) ;
str := ConCat (str, InitString (post)) ;
result := makekey (string (str)) ;
@ -3086,10 +3089,12 @@ BEGIN
IF IsDefImp (moduleSym)
THEN
InitCtorFields (moduleTok, beginTok, finallyTok,
moduleSym,
pSym^.DefImp.ctors, GetSymName (moduleSym),
FALSE, TRUE)
ELSE
InitCtorFields (moduleTok, beginTok, finallyTok,
moduleSym,
pSym^.Module.ctors, GetSymName (moduleSym),
IsInnerModule (moduleSym), TRUE)
END
@ -3102,32 +3107,41 @@ END MakeModuleCtor ;
*)
PROCEDURE InitCtorFields (moduleTok, beginTok, finallyTok: CARDINAL;
moduleSym: CARDINAL;
VAR ctor: ModuleCtor; name: Name;
inner, pub: BOOLEAN) ;
BEGIN
IF ScaffoldDynamic AND (NOT inner)
THEN
(* The ctor procedure must be public. *)
ctor.ctor := MakeProcedure (moduleTok, GenName ("_M2_", name, "_ctor")) ;
ctor.ctor := MakeProcedure (moduleTok,
GenName (GetLibName (moduleSym),
"_M2_", name, "_ctor")) ;
PutCtor (ctor.ctor, TRUE) ;
Assert (pub) ;
PutPublic (ctor.ctor, pub) ;
PutExtern (ctor.ctor, NOT pub) ;
PutMonoName (ctor.ctor, TRUE) ;
(* The dep procedure is local to the module. *)
ctor.dep := MakeProcedure (moduleTok, GenName ("_M2_", name, "_dep")) ;
ctor.dep := MakeProcedure (moduleTok,
GenName (GetLibName (moduleSym),
"_M2_", name, "_dep")) ;
PutMonoName (ctor.dep, TRUE)
ELSE
ctor.ctor := NulSym ;
ctor.dep := NulSym
END ;
(* The init/fini procedures must be public. *)
ctor.init := MakeProcedure (beginTok, GenName ("_M2_", name, "_init")) ;
ctor.init := MakeProcedure (beginTok,
GenName (GetLibName (moduleSym),
"_M2_", name, "_init")) ;
PutPublic (ctor.init, pub) ;
PutExtern (ctor.init, NOT pub) ;
PutMonoName (ctor.init, NOT inner) ;
DeclareArgEnvParams (beginTok, ctor.init) ;
ctor.fini := MakeProcedure (finallyTok, GenName ("_M2_", name, "_fini")) ;
ctor.fini := MakeProcedure (finallyTok,
GenName (GetLibName (moduleSym),
"_M2_", name, "_fini")) ;
PutPublic (ctor.fini, pub) ;
PutExtern (ctor.fini, NOT pub) ;
PutMonoName (ctor.fini, NOT inner) ;
@ -3190,6 +3204,7 @@ BEGIN
WITH Module DO
name := ModuleName ; (* Index into name array, name *)
(* of record field. *)
libname := NulName ; (* Library association. *)
InitCtor (ctors) ; (* Init all ctor functions. *)
InitList(ModListOfDep) ; (* Vector of SymDependency. *)
InitTree(LocalSymbols) ; (* The LocalSymbols hold all the *)
@ -3456,6 +3471,7 @@ BEGIN
WITH Module DO
name := ModuleName ; (* Index into name array, name *)
(* of record field. *)
libname := NulName ; (* Library association. *)
InitCtor (ctors) ; (* Init all ctor functions. *)
InitTree(LocalSymbols) ; (* The LocalSymbols hold all the *)
(* variables declared local to *)
@ -3551,6 +3567,7 @@ BEGIN
WITH DefImp DO
name := DefImpName ; (* Index into name array, name *)
(* of record field. *)
libname := NulName ; (* Library association. *)
InitCtor (ctors) ;
(* Init all ctor functions. *)
InitList(DefListOfDep) ; (* Vector of SymDependency. *)
@ -3653,6 +3670,52 @@ BEGIN
END MakeDefImp ;
(*
PutLibName - places libname into defimp or module sym.
*)
PROCEDURE PutLibName (sym: CARDINAL; libname: Name) ;
VAR
pSym: PtrToSymbol ;
BEGIN
Assert (IsModule (sym) OR IsDefImp (sym)) ;
pSym := GetPsym (sym) ;
WITH pSym^ DO
CASE SymbolType OF
DefImpSym: DefImp.libname := libname |
ModuleSym: Module.libname := libname
ELSE
InternalError ('expecting DefImp or Module symbol')
END
END
END PutLibName ;
(*
GetLibName - returns libname associated with a defimp or module sym.
*)
PROCEDURE GetLibName (sym: CARDINAL) : Name ;
VAR
pSym: PtrToSymbol ;
BEGIN
Assert (IsModule (sym) OR IsDefImp (sym)) ;
pSym := GetPsym (sym) ;
WITH pSym^ DO
CASE SymbolType OF
DefImpSym: RETURN DefImp.libname |
ModuleSym: RETURN Module.libname
ELSE
InternalError ('expecting DefImp or Module symbol')
END
END
END GetLibName ;
(*
PutProcedureExternPublic - if procedure is not NulSym set extern
and public booleans.
@ -3678,7 +3741,7 @@ BEGIN
(* If the ctor does not exist then make it extern/ (~extern) public. *)
IF ctor.ctor = NulSym
THEN
ctor.ctor := MakeProcedure (tok, GenName ("_M2_", GetSymName (sym), "_ctor")) ;
ctor.ctor := MakeProcedure (tok, GenName (GetLibName (sym), "_M2_", GetSymName (sym), "_ctor")) ;
PutMonoName (ctor.ctor, TRUE)
END ;
PutProcedureExternPublic (ctor.ctor, extern, NOT extern) ;
@ -3686,21 +3749,21 @@ BEGIN
(* If the ctor does not exist then make it extern/ (~extern) public. *)
IF ctor.dep = NulSym
THEN
ctor.dep := MakeProcedure (tok, GenName ("_M2_", GetSymName (sym), "_dep")) ;
ctor.dep := MakeProcedure (tok, GenName (GetLibName (sym), "_M2_", GetSymName (sym), "_dep")) ;
PutMonoName (ctor.dep, TRUE)
END ;
PutProcedureExternPublic (ctor.dep, extern, NOT extern) ;
(* If init/fini do not exist then create them. *)
IF ctor.init = NulSym
THEN
ctor.init := MakeProcedure (tok, GenName ("_M2_", GetSymName (sym), "_init")) ;
ctor.init := MakeProcedure (tok, GenName (GetLibName (sym), "_M2_", GetSymName (sym), "_init")) ;
DeclareArgEnvParams (tok, ctor.init) ;
PutMonoName (ctor.init, NOT IsInnerModule (sym))
END ;
PutProcedureExternPublic (ctor.init, extern, NOT extern) ;
IF ctor.fini = NulSym
THEN
ctor.fini := MakeProcedure (tok, GenName ("_M2_", GetSymName (sym), "_fini")) ;
ctor.fini := MakeProcedure (tok, GenName (GetLibName (sym), "_M2_", GetSymName (sym), "_fini")) ;
DeclareArgEnvParams (tok, ctor.fini) ;
PutMonoName (ctor.fini, NOT IsInnerModule (sym))
END ;

6
gcc/m2/gm2-gcc/init.cc
View file

@ -55,7 +55,8 @@ EXTERN void _M2_CmdArgs_init (int argc, char *argv[], char *envp[]);
EXTERN void _M2_M2Preprocess_init (int argc, char *argv[], char *envp[]);
EXTERN void _M2_M2Error_init (int argc, char *argv[], char *envp[]);
EXTERN void _M2_M2Search_init (int argc, char *argv[], char *envp[]);
EXTERN void _M2_DynamicStringPath_init (int argc, char *argv[], char *envp[]);
EXTERN void _M2_DynamicPath_init (int argc, char *argv[], char *envp[]);
EXTERN void _M2_PathName_init (int argc, char *argv[], char *envp[]);
EXTERN void _M2_Indexing_init (int argc, char *argv[], char *envp[]);
EXTERN void _M2_NameKey_init (int argc, char *argv[], char *envp[]);
EXTERN void _M2_NumberIO_init (int argc, char *argv[], char *envp[]);
@ -142,7 +143,8 @@ init_FrontEndInit (void)
_M2_StrLib_init (0, NULL, NULL);
_M2_dtoa_init (0, NULL, NULL);
_M2_ldtoa_init (0, NULL, NULL);
_M2_DynamicStringPath_init (0, NULL, NULL);
_M2_DynamicPath_init (0, NULL, NULL);
_M2_PathName_init (0, NULL, NULL);
_M2_M2Search_init (0, NULL, NULL);
_M2_M2Options_init (0, NULL, NULL);
}

4
gcc/m2/gm2-gcc/m2decl.cc
View file

@ -48,7 +48,7 @@ m2decl_DeclareM2linkStaticInitialization (location_t location,
m2block_pushGlobalScope ();
/* Generate: int M2LINK_StaticInitialization = ScaffoldStatic; */
tree init = m2decl_BuildIntegerConstant (ScaffoldStatic);
tree static_init = m2decl_DeclareKnownVariable (location, "M2LINK_StaticInitialization",
tree static_init = m2decl_DeclareKnownVariable (location, "m2pim_M2LINK_StaticInitialization",
integer_type_node,
TRUE, FALSE, FALSE, TRUE, NULL_TREE, init);
m2block_popGlobalScope ();
@ -65,7 +65,7 @@ m2decl_DeclareM2linkForcedModuleInitOrder (location_t location,
tree ptr_to_char = build_pointer_type (char_type_node);
TYPE_READONLY (ptr_to_char) = TRUE;
tree init = m2decl_BuildPtrToTypeString (location, RuntimeOverride, ptr_to_char);
tree forced_order = m2decl_DeclareKnownVariable (location, "M2LINK_ForcedModuleInitOrder",
tree forced_order = m2decl_DeclareKnownVariable (location, "m2pim_M2LINK_ForcedModuleInitOrder",
ptr_to_char,
TRUE, FALSE, FALSE, TRUE, NULL_TREE, init);
m2block_popGlobalScope ();

4
gcc/m2/gm2-gcc/m2options.h
View file

@ -132,6 +132,10 @@ EXTERN void M2Options_SetMQ (const char *arg);
EXTERN char *M2Options_GetMQ (void);
EXTERN void M2Options_SetObj (const char *arg);
EXTERN char *M2Options_GetObj (void);
EXTERN void M2Options_SetM2Prefix (const char *arg);
EXTERN char *M2Options_GetM2Prefix (void);
EXTERN void M2Options_SetM2PathName (const char *arg);
EXTERN char *M2Options_GetM2PathName (void);
#undef EXTERN
#endif /* m2options_h. */

62
gcc/m2/gm2-lang.cc
View file

@ -49,12 +49,18 @@ static int insideCppArgs = FALSE;
/* We default to pim in the absence of fiso. */
static bool iso = false;
typedef struct named_path_s {
std::vector<const char*>path;
const char *name;
} named_path;
/* The language include paths are based on the libraries in use. */
static bool allow_libraries = true;
static const char *flibs = nullptr;
static const char *iprefix = nullptr;
static const char *imultilib = nullptr;
static std::vector<const char*>Ipaths;
static std::vector<named_path>Ipaths;
static std::vector<const char*>isystem;
static std::vector<const char*>iquote;
@ -319,6 +325,31 @@ is_cpp_filename (unsigned int i)
return filename_cpp[i];
}
static void
push_back_Ipath (const char *arg)
{
if (Ipaths.empty ())
{
named_path np;
np.path.push_back (arg);
np.name = xstrdup (M2Options_GetM2PathName ());
Ipaths.push_back (np);
}
else
{
if (strcmp (Ipaths.back ().name,
M2Options_GetM2PathName ()) == 0)
Ipaths.back ().path.push_back (arg);
else
{
named_path np;
np.path.push_back (arg);
np.name = xstrdup (M2Options_GetM2PathName ());
Ipaths.push_back (np);
}
}
}
/* Handle gm2 specific options. Return 0 if we didn't do anything. */
bool
@ -337,7 +368,7 @@ gm2_langhook_handle_option (
switch (code)
{
case OPT_I:
Ipaths.push_back (arg);
push_back_Ipath (arg);
return 1;
case OPT_fiso:
M2Options_SetISO (value);
@ -517,6 +548,24 @@ gm2_langhook_handle_option (
M2Options_SetM2g (value);
return 1;
break;
case OPT_fm2_pathname_:
if (strcmp (arg, "-") == 0)
M2Options_SetM2PathName ("");
else
M2Options_SetM2PathName (arg);
return 1;
break;
case OPT_fm2_pathnameI:
push_back_Ipath (arg);
return 1;
break;
case OPT_fm2_prefix_:
if (strcmp (arg, "-") == 0)
M2Options_SetM2Prefix ("");
else
M2Options_SetM2Prefix (arg);
return 1;
break;
case OPT_iprefix:
iprefix = arg;
return 1;
@ -608,6 +657,7 @@ add_one_import_path (const char *libname)
strcat (lib, "m2");
strcat (lib, dir_sep);
strcat (lib, libname);
M2Options_SetM2PathName (libname);
M2Options_SetSearchPath (lib);
}
@ -669,8 +719,12 @@ gm2_langhook_post_options (const char **pfilename)
for (auto *s : iquote)
M2Options_SetSearchPath (s);
iquote.clear();
for (auto *s : Ipaths)
M2Options_SetSearchPath (s);
for (auto np : Ipaths)
{
M2Options_SetM2PathName (np.name);
for (auto *s : np.path)
M2Options_SetSearchPath (s);
}
Ipaths.clear();
for (auto *s : isystem)
M2Options_SetSearchPath (s);

9
gcc/m2/gm2-libs-iso/M2RTS.def
View file

@ -33,10 +33,10 @@ TYPE
ArgCVEnvP = PROCEDURE (INTEGER, ADDRESS, ADDRESS) ;
PROCEDURE ConstructModules (applicationmodule: ADDRESS;
PROCEDURE ConstructModules (applicationmodule, libname: ADDRESS;
argc: INTEGER; argv, envp: ADDRESS) ;
PROCEDURE DeconstructModules (applicationmodule: ADDRESS;
PROCEDURE DeconstructModules (applicationmodule, libname: ADDRESS;
argc: INTEGER; argv, envp: ADDRESS) ;
@ -46,7 +46,7 @@ PROCEDURE DeconstructModules (applicationmodule: ADDRESS;
explored to determine initialization order.
*)
PROCEDURE RegisterModule (name: ADDRESS;
PROCEDURE RegisterModule (name, libname: ADDRESS;
init, fini: ArgCVEnvP;
dependencies: PROC) ;
@ -56,7 +56,8 @@ PROCEDURE RegisterModule (name: ADDRESS;
module dependantmodule.
*)
PROCEDURE RequestDependant (modulename, dependantmodule: ADDRESS) ;
PROCEDURE RequestDependant (modulename, libname,
dependantmodule, dependantlibname: ADDRESS) ;
(*

20
gcc/m2/gm2-libs-iso/M2RTS.mod
View file

@ -71,10 +71,11 @@ VAR
module constructor in turn.
*)
PROCEDURE ConstructModules (applicationmodule: ADDRESS;
PROCEDURE ConstructModules (applicationmodule, libname: ADDRESS;
argc: INTEGER; argv, envp: ADDRESS) ;
BEGIN
M2Dependent.ConstructModules (applicationmodule, argc, argv, envp)
M2Dependent.ConstructModules (applicationmodule, libname,
argc, argv, envp)
END ConstructModules ;
@ -83,10 +84,11 @@ END ConstructModules ;
module constructor in turn.
*)
PROCEDURE DeconstructModules (applicationmodule: ADDRESS;
PROCEDURE DeconstructModules (applicationmodule, libname: ADDRESS;
argc: INTEGER; argv, envp: ADDRESS) ;
BEGIN
M2Dependent.DeconstructModules (applicationmodule, argc, argv, envp)
M2Dependent.DeconstructModules (applicationmodule, libname,
argc, argv, envp)
END DeconstructModules ;
@ -96,11 +98,11 @@ END DeconstructModules ;
explored to determine initialization order.
*)
PROCEDURE RegisterModule (name: ADDRESS;
PROCEDURE RegisterModule (name, libname: ADDRESS;
init, fini: ArgCVEnvP;
dependencies: PROC) ;
BEGIN
M2Dependent.RegisterModule (name, init, fini, dependencies)
M2Dependent.RegisterModule (name, libname, init, fini, dependencies)
END RegisterModule ;
@ -109,9 +111,11 @@ END RegisterModule ;
module dependantmodule.
*)
PROCEDURE RequestDependant (modulename, dependantmodule: ADDRESS) ;
PROCEDURE RequestDependant (modulename, libname,
dependantmodule, dependantlibname: ADDRESS) ;
BEGIN
M2Dependent.RequestDependant (modulename, dependantmodule)
M2Dependent.RequestDependant (modulename, libname,
dependantmodule, dependantlibname)
END RequestDependant ;

260
gcc/m2/gm2-libs-iso/wrapsock.c
View file

@ -1,260 +0,0 @@
/* wrapsock.c implements access to low level client socket primitives.
Copyright (C) 2008-2023 Free Software Foundation, Inc.
Contributed by Gaius Mulley <gaius.mulley@southwales.ac.uk>.
This file is part of GNU Modula-2.
GNU Modula-2 is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Modula-2 is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
Under Section 7 of GPL version 3, you are granted additional
permissions described in the GCC Runtime Library Exception, version
3.1, as published by the Free Software Foundation.
You should have received a copy of the GNU General Public License and
a copy of the GCC Runtime Library Exception along with this program;
see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
<http://www.gnu.org/licenses/>. */
#include <p2c/p2c.h>
#if defined(HAVE_SYS_TYPES_H)
# include <sys/types.h>
#endif
#if defined(HAVE_SYS_SOCKET_H)
# include <sys/socket.h>
#endif
#include <netinet/in.h>
#include <netdb.h>
#if defined(HAVE_UNISTD_H)
# include <unistd.h>
#endif
#if defined(HAVE_SIGNAL_H)
# include <signal.h>
#endif
#if defined(HAVE_SYS_ERRNO_H)
# include <sys/errno.h>
#endif
#if defined(HAVE_ERRNO_H)
# include <errno.h>
#endif
#if defined(HAVE_MALLOC_H)
# include <malloc.h>
#endif
#if defined(HAVE_SIGNAL_H)
# include <signal.h>
#endif
#if defined(HAVE_STRING_H)
# include <string.h>
#endif
#if defined(HAVE_STDLIB_H)
# include <stdlib.h>
#endif
#if !defined(TRUE)
# define TRUE (1==1)
#endif
#if !defined(FALSE)
# define FALSE (1==0)
#endif
#include "ChanConsts.h"
#define MAXHOSTNAME 1024
#define MAXPBBUF 1024
typedef struct {
char hostname[MAXHOSTNAME];
struct hostent *hp;
struct sockaddr_in sa;
int sockFd;
int portNo;
int hasChar;
char pbChar[MAXPBBUF];
} clientInfo;
static openResults clientConnect (clientInfo *c);
/*
* clientOpen - returns an ISO Modula-2 OpenResult.
* It attempts to connect to: hostname:portNo.
* If successful then the data structure, c,
* will have its fields initialized.
*/
openResults wrapsock_clientOpen (clientInfo *c, char *hostname,
unsigned int length, int portNo)
{
/* remove SIGPIPE which is raised on the server if the client is killed */
signal(SIGPIPE, SIG_IGN);
c->hp = gethostbyname(hostname);
if (c->hp == NULL)
return noSuchFile;
memset((void *)&c->sa, 0, sizeof(c->sa));
c->sa.sin_family = AF_INET;
memcpy((void *)&c->sa.sin_addr, (void *)c->hp->h_addr, c->hp->h_length);
c->portNo = portNo;
c->sa.sin_port = htons(portNo);
c->hasChar = 0;
/*
* Open a TCP socket (an Internet stream socket)
*/
c->sockFd = socket(c->hp->h_addrtype, SOCK_STREAM, 0);
return clientConnect(c);
}
/*
* clientOpenIP - returns an ISO Modula-2 OpenResult.
* It attempts to connect to: ipaddress:portNo.
* If successful then the data structure, c,
* will have its fields initialized.
*/
openResults wrapsock_clientOpenIP (clientInfo *c, unsigned int ip, int portNo)
{
/* remove SIGPIPE which is raised on the server if the client is killed */
signal(SIGPIPE, SIG_IGN);
memset((void *)&c->sa, 0, sizeof(c->sa));
c->sa.sin_family = AF_INET;
memcpy((void *)&c->sa.sin_addr, (void *)&ip, sizeof(ip));
c->portNo = portNo;
c->sa.sin_port = htons(portNo);
/*
* Open a TCP socket (an Internet stream socket)
*/
c->sockFd = socket(PF_INET, SOCK_STREAM, 0);
return clientConnect(c);
}
/*
* clientConnect - returns an ISO Modula-2 OpenResult
* once a connect has been performed.
* If successful the clientInfo will
* include the file descriptor ready
* for read/write operations.
*/
static openResults clientConnect (clientInfo *c)
{
if (connect(c->sockFd, (struct sockaddr *)&c->sa, sizeof(c->sa)) < 0)
return noSuchFile;
return opened;
}
/*
* getClientPortNo - returns the portNo from structure, c.
*/
int wrapsock_getClientPortNo (clientInfo *c)
{
return c->portNo;
}
/*
* getClientHostname - fills in the hostname of the server
* the to which the client is connecting.
*/
void wrapsock_getClientHostname (clientInfo *c,
char *hostname, unsigned int high)
{
strncpy(hostname, c->hostname, high+1);
}
/*
* getClientSocketFd - returns the sockFd from structure, c.
*/
int wrapsock_getClientSocketFd (clientInfo *c)
{
return c->sockFd;
}
/*
* getClientIP - returns the sockFd from structure, s.
*/
unsigned int wrapsock_getClientIP (clientInfo *c)
{
#if 0
printf("client ip = %s\n", inet_ntoa (c->sa.sin_addr.s_addr));
#endif
return c->sa.sin_addr.s_addr;
}
/*
* getPushBackChar - returns TRUE if a pushed back character
* is available.
*/
unsigned int wrapsock_getPushBackChar (clientInfo *c, char *ch)
{
if (c->hasChar > 0) {
c->hasChar--;
*ch = c->pbChar[c->hasChar];
return TRUE;
}
return FALSE;
}
/*
* setPushBackChar - returns TRUE if it is able to push back a
* character.
*/
unsigned int wrapsock_setPushBackChar (clientInfo *c, char ch)
{
if (c->hasChar == MAXPBBUF)
return FALSE;
c->pbChar[c->hasChar] = ch;
c->hasChar++;
return TRUE;
}
/*
* getSizeOfClientInfo - returns the sizeof (opaque data type).
*/
unsigned int wrapsock_getSizeOfClientInfo (void)
{
return sizeof (clientInfo);
}
/*
* GNU Modula-2 link fodder.
*/
void _M2_wrapsock_init (void)
{
}
void _M2_wrapsock_finish (void)
{
}

292
gcc/m2/gm2-libs-iso/wraptime.c
View file

@ -1,292 +0,0 @@
/* wraptime.c provides access to time functions.
Copyright (C) 2009-2023 Free Software Foundation, Inc.
Contributed by Gaius Mulley <gaius@glam.ac.uk>.
This file is part of GNU Modula-2.
GNU Modula-2 is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Modula-2 is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
Under Section 7 of GPL version 3, you are granted additional
permissions described in the GCC Runtime Library Exception, version
3.1, as published by the Free Software Foundation.
You should have received a copy of the GNU General Public License and
a copy of the GCC Runtime Library Exception along with this program;
see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
<http://www.gnu.org/licenses/>. */
#include "gm2-libs-host.h"
#if defined(HAVE_SYS_TYPES_H)
# include <sys/types.h>
#endif
#if defined(HAVE_SYS_TIME_H)
# include <sys/time.h>
#endif
#if defined(HAVE_TIME_H)
# include <time.h>
#endif
#if defined(HAVE_MALLOC_H)
# include <malloc.h>
#endif
#if !defined(TRUE)
# define TRUE (1==1)
#endif
#if !defined(FALSE)
# define FALSE (1==0)
#endif
/* InitTimeval returns a newly created opaque type. */
struct timeval *
wraptime_InitTimeval (void)
{
#if defined(HAVE_TIMEVAL)
return (struct timeval *) malloc (sizeof (struct timeval));
#else
return NULL;
#endif
}
/* KillTimeval deallocates the memory associated with an
opaque type. */
struct timeval *
wraptime_KillTimeval (void *tv)
{
free (tv);
return NULL;
}
/* InitTimezone returns a newly created opaque type. */
struct timezone *
wraptime_InitTimezone (void)
{
return (struct timezone *) malloc (sizeof (struct timezone));
}
/* KillTimezone deallocates the memory associated with an
opaque type. */
struct timezone *
wraptime_KillTimezone (struct timezone *tv)
{
free (tv);
return NULL;
}
/* InitTM returns a newly created opaque type. */
struct tm *
wraptime_InitTM (void)
{
return (struct tm *) malloc (sizeof (struct tm));
}
/* KillTM deallocates the memory associated with an opaque type. */
struct tm *
wraptime_KillTM (struct tm *tv)
{
free (tv);
return NULL;
}
/* gettimeofday calls gettimeofday(2) with the same parameters, tv,
and, tz. It returns 0 on success. */
int
wraptime_gettimeofday (void *tv, struct timezone *tz)
{
return gettimeofday (tv, tz);
}
/* settimeofday calls settimeofday(2) with the same parameters, tv,
and, tz. It returns 0 on success. */
int
wraptime_settimeofday (void *tv, struct timezone *tz)
{
return settimeofday (tv, tz);
}
/* wraptime_GetFractions returns the tv_usec field inside the timeval
structure. */
#if defined(HAVE_TIMEVAL)
unsigned int
wraptime_GetFractions (struct timeval *tv)
{
return (unsigned int) tv->tv_usec;
}
#else
unsigned int
wraptime_GetFractions (void *tv)
{
return 0;
}
#endif
/* localtime_r returns the tm parameter, m, after it has been assigned
with appropriate contents determined by, tv. Notice that this
procedure function expects, timeval, as its first parameter and not
a time_t (as expected by the posix equivalent). */
#if defined(HAVE_TIMEVAL)
struct tm *
wraptime_localtime_r (struct timeval *tv, struct tm *m)
{
return localtime_r (&tv->tv_sec, m);
}
#else
struct tm *
wraptime_localtime_r (void *tv, struct tm *m)
{
return m;
}
#endif
/* wraptime_GetYear returns the year from the structure, m. */
unsigned int
wraptime_GetYear (struct tm *m)
{
return m->tm_year;
}
/* wraptime_GetMonth returns the month from the structure, m. */
unsigned int
wraptime_GetMonth (struct tm *m)
{
return m->tm_mon;
}
/* wraptime_GetDay returns the day of the month from the structure, m. */
unsigned int
wraptime_GetDay (struct tm *m)
{
return m->tm_mday;
}
/* wraptime_GetHour returns the hour of the day from the structure, m. */
unsigned int
wraptime_GetHour (struct tm *m)
{
return m->tm_hour;
}
/* wraptime_GetMinute returns the minute within the hour from the structure, m. */
unsigned int
wraptime_GetMinute (struct tm *m)
{
return m->tm_min;
}
/* wraptime_GetSecond returns the seconds in the minute from the
structure, m. The return value will always be in the range 0..59.
A leap minute of value 60 will be truncated to 59. */
unsigned int
wraptime_GetSecond (struct tm *m)
{
if (m->tm_sec == 60)
return 59;
else
return m->tm_sec;
}
/* wraptime_GetSummerTime returns true if summer time is in effect. */
unsigned int
wraptime_GetSummerTime (struct timezone *tz)
{
return tz->tz_dsttime != 0;
}
/* wraptime_GetDST returns the number of minutes west of GMT. */
int
wraptime_GetDST (struct timezone *tz)
{
return tz->tz_minuteswest;
}
/* SetTimezone set the timezone field inside timeval, tv. */
void
wraptime_SetTimezone (struct timezone *tz,
int zone, int minuteswest)
{
tz->tz_dsttime = zone;
tz->tz_minuteswest = minuteswest;
}
/* SetTimeval sets the fields in tm, t, with:
second, minute, hour, day, month, year, fractions. */
#if defined(HAVE_TIMEVAL)
void
wraptime_SetTimeval (struct tm *t,
unsigned int second,
unsigned int minute,
unsigned int hour,
unsigned int day,
unsigned int month,
unsigned int year,
unsigned int yday,
unsigned int wday,
unsigned int isdst)
{
t->tm_sec = second;
t->tm_min = minute;
t->tm_hour = hour;
t->tm_mday = day;
t->tm_mon = month;
t->tm_year = year;
t->tm_yday = yday;
t->tm_wday = wday;
t->tm_isdst = isdst;
}
#else
wraptime_SetTimeval (void *t,
unsigned int second,
unsigned int minute,
unsigned int hour,
unsigned int day,
unsigned int month,
unsigned int year,
unsigned int yday,
unsigned int wday,
unsigned int isdst)
{
return t;
}
#endif
/* init/finish functions for the module. */
void
_M2_wraptime_init ()
{}
void
_M2_wraptime_finish ()
{}

26
gcc/m2/gm2-libs-min/M2RTS.def
View file

@ -34,18 +34,36 @@ FROM SYSTEM IMPORT ADDRESS ;
TYPE
ArgCVEnvP = PROCEDURE (INTEGER, ADDRESS, ADDRESS) ;
(*
all these procedures do nothing except satisfy the linker.
*)
PROCEDURE ConstructModules (applicationmodule: ADDRESS;
PROCEDURE ConstructModules (applicationmodule, libname: ADDRESS;
argc: INTEGER; argv, envp: ADDRESS) ;
PROCEDURE DeconstructModules (applicationmodule: ADDRESS;
PROCEDURE DeconstructModules (applicationmodule, libname: ADDRESS;
argc: INTEGER; argv, envp: ADDRESS) ;
PROCEDURE RegisterModule (name: ADDRESS;
(*
RegisterModule - adds module name to the list of outstanding
modules which need to have their dependencies
explored to determine initialization order.
*)
PROCEDURE RegisterModule (name, libname: ADDRESS;
init, fini: ArgCVEnvP;
dependencies: PROC) ;
PROCEDURE RequestDependant (modulename, dependantmodule: ADDRESS) ;
(*
RequestDependant - used to specify that modulename is dependant upon
module dependantmodule.
*)
PROCEDURE RequestDependant (modulename, libname,
dependantmodule, dependantlibname: ADDRESS) ;
PROCEDURE ExecuteTerminationProcedures ;
PROCEDURE ExecuteInitialProcedures ;
PROCEDURE HALT <* noreturn *> ;

43
gcc/m2/gm2-libs-min/M2RTS.mod
View file

@ -30,18 +30,31 @@ IMPORT libc, SYSTEM ;
(* we reference these to ensure they are dragged in to the link *)
PROCEDURE ConstructModules (applicationmodule: ADDRESS;
PROCEDURE ConstructModules (applicationmodule, libname: ADDRESS;
argc: INTEGER; argv, envp: ADDRESS) ;
BEGIN
END ConstructModules ;
PROCEDURE DeconstructModules (applicationmodule: ADDRESS;
PROCEDURE DeconstructModules (applicationmodule, libname: ADDRESS;
argc: INTEGER; argv, envp: ADDRESS) ;
BEGIN
END DeconstructModules ;
(*
RegisterModule - adds module name to the list of outstanding
modules which need to have their dependencies
explored to determine initialization order.
*)
PROCEDURE RegisterModule (name, libname: ADDRESS;
init, fini: ArgCVEnvP;
dependencies: PROC) ;
BEGIN
END RegisterModule ;
(* all these procedures do nothing except satisfy the linker. *)
PROCEDURE ExecuteTerminationProcedures ;
@ -65,27 +78,15 @@ BEGIN
END NoException ;
PROCEDURE RequestDependant (modulename, dependantmodule: ADDRESS) ;
(*
RequestDependant - used to specify that modulename is dependant upon
module dependantmodule.
*)
PROCEDURE RequestDependant (modulename, libname,
dependantmodule, dependantlibname: ADDRESS) ;
BEGIN
END RequestDependant ;
PROCEDURE ConstructModules (applicationmodule: ADDRESS;
argc: INTEGER; argv, envp: ADDRESS) ;
BEGIN
END ConstructModules ;
PROCEDURE DeconstructModules (applicationmodule: ADDRESS;
argc: INTEGER; argv, envp: ADDRESS) ;
BEGIN
END DeconstructModules ;
PROCEDURE RegisterModule (name: ADDRESS;
init, fini: ArgCVEnvP;
dependencies: PROC) ;
BEGIN
END RegisterModule ;
END M2RTS.

14
gcc/m2/gm2-libs/M2Dependent.def
View file

@ -33,10 +33,10 @@ TYPE
ArgCVEnvP = PROCEDURE (INTEGER, ADDRESS, ADDRESS) ;
PROCEDURE ConstructModules (applicationmodule: ADDRESS;
PROCEDURE ConstructModules (applicationmodule, libname: ADDRESS;
argc: INTEGER; argv, envp: ADDRESS) ;
PROCEDURE DeconstructModules (applicationmodule: ADDRESS;
PROCEDURE DeconstructModules (applicationmodule, libname: ADDRESS;
argc: INTEGER; argv, envp: ADDRESS) ;
@ -46,17 +46,19 @@ PROCEDURE DeconstructModules (applicationmodule: ADDRESS;
explored to determine initialization order.
*)
PROCEDURE RegisterModule (name: ADDRESS;
PROCEDURE RegisterModule (modulename, libname: ADDRESS;
init, fini: ArgCVEnvP;
dependencies: PROC) ;
(*
RequestDependant - used to specify that modulename is dependant upon
module dependantmodule.
RequestDependant - used to specify that modulename:libname
is dependant upon
module dependantmodule:dependantlibname
*)
PROCEDURE RequestDependant (modulename, dependantmodule: ADDRESS) ;
PROCEDURE RequestDependant (modulename, libname,
dependantmodule, dependantlibname: ADDRESS) ;
END M2Dependent.

381
gcc/m2/gm2-libs/M2Dependent.mod
View file

@ -27,11 +27,11 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
IMPLEMENTATION MODULE M2Dependent ;
FROM libc IMPORT abort, exit, write, getenv, printf ;
FROM libc IMPORT abort, exit, write, getenv, printf, snprintf, strncpy ;
(* FROM Builtins IMPORT strncmp, strcmp ; not available during bootstrap. *)
FROM M2LINK IMPORT ForcedModuleInitOrder, StaticInitialization, PtrToChar ;
FROM ASCII IMPORT nul, nl ;
FROM SYSTEM IMPORT ADR ;
FROM SYSTEM IMPORT ADR, SIZE ;
FROM Storage IMPORT ALLOCATE ;
FROM StrLib IMPORT StrCopy, StrLen, StrEqual ;
@ -52,7 +52,8 @@ TYPE
END ;
ModuleChain = POINTER TO RECORD
name : ADDRESS ;
name,
libname : ADDRESS ;
init,
fini : ArgCVEnvP ;
dependency: DependencyList ;
@ -63,7 +64,9 @@ TYPE
VAR
Modules : ARRAY DependencyState OF ModuleChain ;
Initialized,
WarningTrace,
ModuleTrace,
HexTrace,
DependencyTrace,
PreTrace,
PostTrace,
@ -75,20 +78,27 @@ VAR
ModuleChain.
*)
PROCEDURE CreateModule (name: ADDRESS;
PROCEDURE CreateModule (name, libname: ADDRESS;
init, fini: ArgCVEnvP;
dependencies: PROC) : ModuleChain ;
VAR
mptr: ModuleChain ;
mptr : ModuleChain ;
p0, p1: ADDRESS ;
BEGIN
NEW (mptr) ;
mptr^.name := name ;
mptr^.libname := libname ;
mptr^.init := init ;
mptr^.fini := fini ;
mptr^.dependency.proc := dependencies ;
mptr^.dependency.state := unregistered ;
mptr^.prev := NIL ;
mptr^.next := NIL ;
IF HexTrace
THEN
printf (" (init: %p fini: %p", init, fini) ;
printf (" dep: %p)", dependencies)
END ;
RETURN mptr
END CreateModule ;
@ -157,12 +167,43 @@ END onChain ;
(*
LookupModuleN - lookup module from the state list. The string is limited
to nchar.
max -
*)
PROCEDURE max (a, b: CARDINAL) : CARDINAL ;
BEGIN
IF a > b
THEN
RETURN a
ELSE
RETURN b
END
END max ;
(*
min -
*)
PROCEDURE min (a, b: CARDINAL) : CARDINAL ;
BEGIN
IF a < b
THEN
RETURN a
ELSE
RETURN b
END
END min ;
(*
LookupModuleN - lookup module from the state list.
The strings lengths are known.
*)
PROCEDURE LookupModuleN (state: DependencyState;
name: ADDRESS; nchar: CARDINAL) : ModuleChain ;
name: ADDRESS; namelen: CARDINAL;
libname: ADDRESS; libnamelen: CARDINAL) : ModuleChain ;
VAR
ptr: ModuleChain ;
BEGIN
@ -170,7 +211,10 @@ BEGIN
THEN
ptr := Modules[state] ;
REPEAT
IF strncmp (ptr^.name, name, nchar) = 0
IF (strncmp (ptr^.name, name,
max (namelen, strlen (ptr^.name))) = 0) AND
(strncmp (ptr^.libname, libname,
max (libnamelen, strlen (ptr^.libname))) = 0)
THEN
RETURN ptr
END ;
@ -186,9 +230,11 @@ END LookupModuleN ;
module name from a particular list.
*)
PROCEDURE LookupModule (state: DependencyState; name: ADDRESS) : ModuleChain ;
PROCEDURE LookupModule (state: DependencyState; name, libname: ADDRESS) : ModuleChain ;
BEGIN
RETURN LookupModuleN (state, name, strlen (name))
RETURN LookupModuleN (state,
name, strlen (name),
libname, strlen (libname))
END LookupModule ;
@ -254,7 +300,10 @@ END strcmp ;
PROCEDURE strncmp (a, b: PtrToChar; n: CARDINAL) : INTEGER ;
BEGIN
IF (a # NIL) AND (b # NIL) AND (n > 0)
IF n = 0
THEN
RETURN 0
ELSIF (a # NIL) AND (b # NIL)
THEN
IF a = b
THEN
@ -316,15 +365,49 @@ END traceprintf ;
*)
PROCEDURE traceprintf2 (flag: BOOLEAN; str: ARRAY OF CHAR; arg: ADDRESS) ;
VAR
ch: CHAR ;
BEGIN
IF flag
THEN
toCString (str) ;
IF arg = NIL
THEN
ch := 0C ;
arg := ADR (ch)
END ;
printf (str, arg)
END
END traceprintf2 ;
(*
traceprintf3 - wrap printf with a boolean flag.
*)
PROCEDURE traceprintf3 (flag: BOOLEAN; str: ARRAY OF CHAR;
arg1, arg2: ADDRESS) ;
VAR
ch: CHAR ;
BEGIN
IF flag
THEN
toCString (str) ;
IF arg1 = NIL
THEN
ch := 0C ;
arg1 := ADR (ch)
END ;
IF arg2 = NIL
THEN
ch := 0C ;
arg2 := ADR (ch)
END ;
printf (str, arg1, arg2)
END
END traceprintf3 ;
(*
moveTo - moves mptr to the new list determined by newstate.
It updates the mptr state appropriately.
@ -345,22 +428,24 @@ END moveTo ;
ResolveDependant -
*)
PROCEDURE ResolveDependant (mptr: ModuleChain; currentmodule: ADDRESS) ;
PROCEDURE ResolveDependant (mptr: ModuleChain; currentmodule, libname: ADDRESS) ;
BEGIN
IF mptr = NIL
THEN
traceprintf (DependencyTrace, " module has not been registered via a global constructor\n");
traceprintf3 (DependencyTrace,
" module %s [%s] has not been registered via a global constructor\n",
currentmodule, libname);
ELSE
IF onChain (started, mptr)
THEN
traceprintf (DependencyTrace, " processing...\n");
ELSE
moveTo (started, mptr) ;
traceprintf2 (DependencyTrace, " starting: %s\n",
currentmodule);
traceprintf3 (DependencyTrace, " starting: %s [%s]\n",
currentmodule, libname);
mptr^.dependency.proc ; (* Invoke and process the dependency graph. *)
traceprintf2 (DependencyTrace, " finished: %s\n",
currentmodule);
traceprintf3 (DependencyTrace, " finished: %s [%s]\n",
currentmodule, libname);
moveTo (ordered, mptr)
END
END
@ -373,12 +458,14 @@ END ResolveDependant ;
if we are not using StaticInitialization.
*)
PROCEDURE RequestDependant (modulename, dependantmodule: ADDRESS) ;
PROCEDURE RequestDependant (modulename, libname,
dependantmodule, dependantlibname: ADDRESS) ;
BEGIN
CheckInitialized ;
IF NOT StaticInitialization
THEN
PerformRequestDependant (modulename, dependantmodule)
PerformRequestDependant (modulename, libname,
dependantmodule, dependantlibname)
END
END RequestDependant ;
@ -390,66 +477,73 @@ END RequestDependant ;
resolved.
*)
PROCEDURE PerformRequestDependant (modulename, dependantmodule: ADDRESS) ;
PROCEDURE PerformRequestDependant (modulename, libname,
dependantmodule, dependantlibname: ADDRESS) ;
VAR
mptr: ModuleChain ;
BEGIN
traceprintf2 (DependencyTrace, " module %s", modulename) ;
traceprintf3 (DependencyTrace, " module %s [%s]", modulename, libname) ;
IF dependantmodule = NIL
THEN
traceprintf2 (DependencyTrace, " has finished its import graph\n", modulename) ;
mptr := LookupModule (unordered, modulename) ;
traceprintf (DependencyTrace, " has finished its import graph\n") ;
mptr := LookupModule (unordered, modulename, libname) ;
IF mptr # NIL
THEN
traceprintf2 (DependencyTrace, " module %s is now ordered\n", modulename) ;
traceprintf3 (DependencyTrace, " module %s [%s] is now ordered\n",
modulename, libname) ;
moveTo (ordered, mptr)
END
ELSE
traceprintf2 (DependencyTrace, " imports from %s\n", dependantmodule) ;
mptr := LookupModule (ordered, dependantmodule) ;
traceprintf3 (DependencyTrace, " imports from %s [%s]\n",
dependantmodule, dependantlibname) ;
mptr := LookupModule (ordered, dependantmodule, dependantlibname) ;
IF mptr = NIL
THEN
traceprintf2 (DependencyTrace, " module %s is not ordered\n", dependantmodule) ;
mptr := LookupModule (unordered, dependantmodule) ;
traceprintf3 (DependencyTrace, " module %s [%s] is not ordered\n",
dependantmodule, dependantlibname) ;
mptr := LookupModule (unordered, dependantmodule, dependantlibname) ;
IF mptr = NIL
THEN
traceprintf2 (DependencyTrace, " module %s is not unordered\n", dependantmodule) ;
mptr := LookupModule (started, dependantmodule) ;
traceprintf3 (DependencyTrace, " module %s [%s] is not unordered\n",
dependantmodule, dependantlibname) ;
mptr := LookupModule (started, dependantmodule, dependantlibname) ;
IF mptr = NIL
THEN
traceprintf2 (DependencyTrace, " module %s has not started\n", dependantmodule) ;
traceprintf2 (DependencyTrace, " module %s attempting to import from",
modulename) ;
traceprintf2 (DependencyTrace, " %s which has not registered itself via a constructor\n",
dependantmodule)
traceprintf3 (DependencyTrace, " module %s [%s] has not started\n",
dependantmodule, dependantlibname) ;
traceprintf3 (DependencyTrace, " module %s [%s] attempting to import from",
modulename, libname) ;
traceprintf3 (DependencyTrace, " %s [%s] which has not registered itself via a constructor\n",
dependantmodule, dependantlibname)
ELSE
traceprintf2 (DependencyTrace, " module %s has registered itself and has started\n", dependantmodule)
traceprintf3 (DependencyTrace, " module %s [%s] has registered itself and has started\n",
dependantmodule, dependantlibname)
END
ELSE
traceprintf2 (DependencyTrace, " module %s resolving\n", dependantmodule) ;
ResolveDependant (mptr, dependantmodule)
traceprintf3 (DependencyTrace, " module %s [%s] resolving\n", dependantmodule, dependantlibname) ;
ResolveDependant (mptr, dependantmodule, dependantlibname)
END
ELSE
traceprintf2 (DependencyTrace, " module %s ", modulename) ;
traceprintf2 (DependencyTrace, " dependant %s is ordered\n", dependantmodule)
traceprintf3 (DependencyTrace, " module %s [%s]", modulename, libname) ;
traceprintf3 (DependencyTrace, " dependant %s [%s] is ordered\n", dependantmodule, dependantlibname)
END
END
END PerformRequestDependant ;
(*
ResolveDependencies - resolve dependencies for currentmodule.
ResolveDependencies - resolve dependencies for currentmodule, libname.
*)
PROCEDURE ResolveDependencies (currentmodule: ADDRESS) ;
PROCEDURE ResolveDependencies (currentmodule, libname: ADDRESS) ;
VAR
mptr: ModuleChain ;
BEGIN
mptr := LookupModule (unordered, currentmodule) ;
mptr := LookupModule (unordered, currentmodule, libname) ;
WHILE mptr # NIL DO
traceprintf2 (DependencyTrace, " attempting to resolve the dependants for %s\n",
currentmodule);
ResolveDependant (mptr, currentmodule) ;
traceprintf3 (DependencyTrace, " attempting to resolve the dependants for %s [%s]\n",
currentmodule, libname);
ResolveDependant (mptr, currentmodule, libname) ;
mptr := Modules[unordered]
END
END ResolveDependencies ;
@ -459,18 +553,23 @@ END ResolveDependencies ;
DisplayModuleInfo - displays all module in the state.
*)
PROCEDURE DisplayModuleInfo (state: DependencyState; name: ARRAY OF CHAR) ;
PROCEDURE DisplayModuleInfo (state: DependencyState; desc: ARRAY OF CHAR) ;
VAR
mptr : ModuleChain ;
count: CARDINAL ;
BEGIN
IF Modules[state] # NIL
THEN
printf ("%s modules\n", ADR (name)) ;
printf ("%s modules\n", ADR (desc)) ;
mptr := Modules[state] ;
count := 0 ;
REPEAT
printf (" %d %s", count, mptr^.name) ;
IF mptr^.name = NIL
THEN
printf (" %d %s []", count, mptr^.name)
ELSE
printf (" %d %s [%s]", count, mptr^.name, mptr^.libname)
END ;
INC (count) ;
IF mptr^.dependency.appl
THEN
@ -528,6 +627,50 @@ BEGIN
END combine ;
(*
tracemodule -
*)
PROCEDURE tracemodule (flag: BOOLEAN; modname: ADDRESS; modlen: CARDINAL; libname: ADDRESS; liblen: CARDINAL) ;
VAR
buffer: ARRAY [0..100] OF CHAR ;
len : CARDINAL ;
BEGIN
IF flag
THEN
len := min (modlen, SIZE (buffer)-1) ;
strncpy (ADR(buffer), modname, len) ;
buffer[len] := 0C ;
printf ("%s ", ADR (buffer)) ;
len := min (liblen, SIZE (buffer)-1) ;
strncpy (ADR(buffer), libname, len) ;
buffer[len] := 0C ;
printf (" [%s]", ADR (buffer))
END
END tracemodule ;
(*
ForceModule -
*)
PROCEDURE ForceModule (modname: ADDRESS; modlen: CARDINAL;
libname: ADDRESS; liblen: CARDINAL) ;
VAR
mptr: ModuleChain ;
BEGIN
traceprintf (ForceTrace, "forcing module: ") ;
tracemodule (ForceTrace, modname, modlen, libname, liblen) ;
traceprintf (ForceTrace, "\n") ;
mptr := LookupModuleN (ordered, modname, modlen, libname, liblen) ;
IF mptr # NIL
THEN
mptr^.dependency.forced := TRUE ;
moveTo (user, mptr)
END
END ForceModule ;
(*
ForceDependencies - if the user has specified a forced order then we override
the dynamic ordering with the preference.
@ -535,42 +678,48 @@ END combine ;
PROCEDURE ForceDependencies ;
VAR
mptr,
userChain: ModuleChain ;
count : CARDINAL ;
len,
modlen,
liblen : CARDINAL ;
modname,
libname,
pc, start: PtrToChar ;
BEGIN
IF ForcedModuleInitOrder # NIL
THEN
userChain := NIL ;
traceprintf2 (ForceTrace, "user forcing order: %s\n", ForcedModuleInitOrder) ;
pc := ForcedModuleInitOrder ;
start := pc ;
count := 0 ;
len := 0 ;
modname := NIL ;
modlen := 0 ;
libname := NIL ;
liblen := 0 ;
WHILE pc^ # nul DO
IF pc^ = ','
THEN
mptr := LookupModuleN (ordered, start, count) ;
IF mptr # NIL
THEN
mptr^.dependency.forced := TRUE ;
moveTo (user, mptr)
END ;
INC (pc) ;
start := pc ;
count := 0
CASE pc^ OF
':': libname := start ;
liblen := len ;
len := 0 ;
INC (pc) ;
start := pc |
',': modname := start ;
modlen := len ;
ForceModule (modname, modlen, libname, liblen) ;
libname := NIL ;
liblen := 0 ;
modlen := 0 ;
len := 0 ;
INC (pc) ;
start := pc
ELSE
INC (pc) ;
INC (count)
INC (len)
END
END ;
IF start # pc
THEN
mptr := LookupModuleN (ordered, start, count) ;
IF mptr # NIL
THEN
mptr^.dependency.forced := TRUE ;
moveTo (user, mptr)
END
ForceModule (start, len, libname, liblen)
END ;
combine (user, ordered)
END
@ -601,7 +750,8 @@ BEGIN
UNTIL (appl # NIL) OR (mptr=Modules[ordered]) ;
IF appl # NIL
THEN
Modules[ordered] := appl^.next
RemoveModule (Modules[ordered], appl) ;
AppendModule (Modules[ordered], appl)
END
END
END CheckApplication ;
@ -612,22 +762,23 @@ END CheckApplication ;
module constructor in turn.
*)
PROCEDURE ConstructModules (applicationmodule: ADDRESS;
PROCEDURE ConstructModules (applicationmodule, libname: ADDRESS;
argc: INTEGER; argv, envp: ADDRESS) ;
VAR
mptr: ModuleChain ;
nulp: ArgCVEnvP ;
BEGIN
CheckInitialized ;
traceprintf2 (ModuleTrace, "application module: %s\n", applicationmodule);
mptr := LookupModule (unordered, applicationmodule) ;
traceprintf3 (ModuleTrace, "application module: %s [%s]\n",
applicationmodule, libname);
mptr := LookupModule (unordered, applicationmodule, libname) ;
IF mptr # NIL
THEN
mptr^.dependency.appl := TRUE
END ;
traceprintf (PreTrace, "Pre resolving dependents\n");
DumpModuleData (PreTrace) ;
ResolveDependencies (applicationmodule) ;
ResolveDependencies (applicationmodule, libname) ;
traceprintf (PreTrace, "Post resolving dependents\n");
DumpModuleData (PostTrace) ;
ForceDependencies ;
@ -638,7 +789,8 @@ BEGIN
DumpModuleData (ForceTrace) ;
IF Modules[ordered] = NIL
THEN
traceprintf2 (ModuleTrace, " module: %s has not registered itself using a global constructor\n", applicationmodule);
traceprintf3 (ModuleTrace, " module: %s [%s] has not registered itself using a global constructor\n",
applicationmodule, libname);
traceprintf2 (ModuleTrace, " hint try compile and linking using: gm2 %s.mod\n", applicationmodule);
traceprintf2 (ModuleTrace, " or try using: gm2 -fscaffold-static %s.mod\n",
applicationmodule);
@ -647,13 +799,13 @@ BEGIN
REPEAT
IF mptr^.dependency.forc
THEN
traceprintf2 (ModuleTrace, "initializing module: %s for C\n", mptr^.name);
traceprintf3 (ModuleTrace, "initializing module: %s [%s] for C\n", mptr^.name, mptr^.libname)
ELSE
traceprintf2 (ModuleTrace, "initializing module: %s\n", mptr^.name);
traceprintf3 (ModuleTrace, "initializing module: %s [%s]\n", mptr^.name, mptr^.libname);
END ;
IF mptr^.dependency.appl
THEN
traceprintf2 (ModuleTrace, "application module: %s\n", mptr^.name);
traceprintf3 (ModuleTrace, "application module: %s [%s]\n", mptr^.name, mptr^.libname);
traceprintf (ModuleTrace, " calling M2RTS_ExecuteInitialProcedures\n");
M2RTS.ExecuteInitialProcedures ;
traceprintf (ModuleTrace, " calling application module\n");
@ -670,12 +822,13 @@ END ConstructModules ;
module constructor in turn.
*)
PROCEDURE DeconstructModules (applicationmodule: ADDRESS;
PROCEDURE DeconstructModules (applicationmodule, libname: ADDRESS;
argc: INTEGER; argv, envp: ADDRESS) ;
VAR
mptr: ModuleChain ;
BEGIN
traceprintf2 (ModuleTrace, "application module finishing: %s\n", applicationmodule);
traceprintf3 (ModuleTrace, "application module finishing: %s [%s]\n",
applicationmodule, libname);
IF Modules[ordered] = NIL
THEN
traceprintf (ModuleTrace, " no ordered modules found during finishing\n")
@ -687,9 +840,11 @@ BEGIN
REPEAT
IF mptr^.dependency.forc
THEN
traceprintf2 (ModuleTrace, "finalizing module: %s for C\n", mptr^.name);
traceprintf3 (ModuleTrace, "finalizing module: %s [%s] for C\n",
mptr^.name, mptr^.libname)
ELSE
traceprintf2 (ModuleTrace, "finalizing module: %s\n", mptr^.name);
traceprintf3 (ModuleTrace, "finalizing module: %s [%s]\n",
mptr^.name, mptr^.libname)
END ;
mptr^.fini (argc, argv, envp) ;
mptr := mptr^.prev
@ -698,23 +853,52 @@ BEGIN
END DeconstructModules ;
(*
warning3 - write format arg1 arg2 to stderr.
*)
PROCEDURE warning3 (format: ARRAY OF CHAR; arg1, arg2: ADDRESS) ;
VAR
buffer: ARRAY [0..4096] OF CHAR ;
len : INTEGER ;
BEGIN
IF WarningTrace
THEN
len := snprintf (ADR (buffer), SIZE (buffer), "warning: ") ;
write (2, ADR (buffer), len) ;
len := snprintf (ADR (buffer), SIZE (buffer), format, arg1, arg2) ;
write (2, ADR (buffer), len)
END
END warning3 ;
(*
RegisterModule - adds module name to the list of outstanding
modules which need to have their dependencies
explored to determine initialization order.
*)
PROCEDURE RegisterModule (name: ADDRESS;
PROCEDURE RegisterModule (modulename, libname: ADDRESS;
init, fini: ArgCVEnvP;
dependencies: PROC) ;
VAR
mptr: ModuleChain ;
BEGIN
CheckInitialized ;
IF NOT StaticInitialization
THEN
traceprintf2 (ModuleTrace, "module: %s registering\n",
name);
moveTo (unordered,
CreateModule (name, init, fini, dependencies))
mptr := LookupModule (unordered, modulename, libname) ;
IF mptr = NIL
THEN
traceprintf3 (ModuleTrace, "module: %s [%s] registering",
modulename, libname);
moveTo (unordered,
CreateModule (modulename, libname, init, fini, dependencies)) ;
traceprintf (ModuleTrace, "\n") ;
ELSE
warning3 ("module: %s [%s] (ignoring duplicate registration)\n",
modulename, libname)
END
END
END RegisterModule ;
@ -733,11 +917,12 @@ END equal ;
SetupDebugFlags - By default assigns ModuleTrace, DependencyTrace,
DumpPostInit to FALSE. It checks the environment
GCC_M2LINK_RTFLAG which can contain
"all,module,pre,post,dep,force". all turns them all on.
"all,module,hex,pre,post,dep,force". all turns them all on.
The flag meanings are as follows and flags the are in
execution order.
module generate trace info as the modules are registered.
hex dump the modules ctor functions address in hex.
pre generate a list of all modules seen prior to having
their dependancies resolved.
dep display a trace as the modules are resolved.
@ -756,6 +941,8 @@ BEGIN
PostTrace := FALSE ;
PreTrace := FALSE ;
ForceTrace := FALSE ;
HexTrace := FALSE ;
WarningTrace := FALSE ;
pc := getenv (ADR ("GCC_M2LINK_RTFLAG")) ;
WHILE (pc # NIL) AND (pc^ # nul) DO
IF equal (pc, "all")
@ -765,11 +952,21 @@ BEGIN
PreTrace := TRUE ;
PostTrace := TRUE ;
ForceTrace := TRUE ;
HexTrace := TRUE ;
WarningTrace := TRUE ;
INC (pc, 3)
ELSIF equal (pc, "module")
THEN
ModuleTrace := TRUE ;
INC (pc, 6)
ELSIF equal (pc, "warning")
THEN
WarningTrace := TRUE ;
INC (pc, 7)
ELSIF equal (pc, "hex")
THEN
HexTrace := TRUE ;
INC (pc, 3)
ELSIF equal (pc, "dep")
THEN
DependencyTrace := TRUE ;

9
gcc/m2/gm2-libs/M2RTS.def
View file

@ -33,10 +33,10 @@ TYPE
ArgCVEnvP = PROCEDURE (INTEGER, ADDRESS, ADDRESS) ;
PROCEDURE ConstructModules (applicationmodule: ADDRESS;
PROCEDURE ConstructModules (applicationmodule, libname: ADDRESS;
argc: INTEGER; argv, envp: ADDRESS) ;
PROCEDURE DeconstructModules (applicationmodule: ADDRESS;
PROCEDURE DeconstructModules (applicationmodule, libname: ADDRESS;
argc: INTEGER; argv, envp: ADDRESS) ;
@ -46,7 +46,7 @@ PROCEDURE DeconstructModules (applicationmodule: ADDRESS;
explored to determine initialization order.
*)
PROCEDURE RegisterModule (name: ADDRESS;
PROCEDURE RegisterModule (name, libname: ADDRESS;
init, fini: ArgCVEnvP;
dependencies: PROC) ;
@ -56,7 +56,8 @@ PROCEDURE RegisterModule (name: ADDRESS;
module dependantmodule.
*)
PROCEDURE RequestDependant (modulename, dependantmodule: ADDRESS) ;
PROCEDURE RequestDependant (modulename, libname,
dependantmodule, dependantlibname: ADDRESS) ;
(*

20
gcc/m2/gm2-libs/M2RTS.mod
View file

@ -70,10 +70,11 @@ VAR
module constructor in turn.
*)
PROCEDURE ConstructModules (applicationmodule: ADDRESS;
PROCEDURE ConstructModules (applicationmodule, libname: ADDRESS;
argc: INTEGER; argv, envp: ADDRESS) ;
BEGIN
M2Dependent.ConstructModules (applicationmodule, argc, argv, envp)
M2Dependent.ConstructModules (applicationmodule, libname,
argc, argv, envp)
END ConstructModules ;
@ -82,10 +83,11 @@ END ConstructModules ;
module constructor in turn.
*)
PROCEDURE DeconstructModules (applicationmodule: ADDRESS;
PROCEDURE DeconstructModules (applicationmodule, libname: ADDRESS;
argc: INTEGER; argv, envp: ADDRESS) ;
BEGIN
M2Dependent.DeconstructModules (applicationmodule, argc, argv, envp)
M2Dependent.DeconstructModules (applicationmodule, libname,
argc, argv, envp)
END DeconstructModules ;
@ -95,11 +97,11 @@ END DeconstructModules ;
explored to determine initialization order.
*)
PROCEDURE RegisterModule (name: ADDRESS;
PROCEDURE RegisterModule (name, libname: ADDRESS;
init, fini: ArgCVEnvP;
dependencies: PROC) ;
BEGIN
M2Dependent.RegisterModule (name, init, fini, dependencies)
M2Dependent.RegisterModule (name, libname, init, fini, dependencies)
END RegisterModule ;
@ -108,9 +110,11 @@ END RegisterModule ;
module dependantmodule.
*)
PROCEDURE RequestDependant (modulename, dependantmodule: ADDRESS) ;
PROCEDURE RequestDependant (modulename, libname,
dependantmodule, dependantlibname: ADDRESS) ;
BEGIN
M2Dependent.RequestDependant (modulename, dependantmodule)
M2Dependent.RequestDependant (modulename, libname,
dependantmodule, dependantlibname)
END RequestDependant ;

399
gcc/m2/gm2-libs/RTint.mod
View file

@ -97,21 +97,21 @@ END Min ;
(*
FindVector - searches the exists list for a vector of type, t,
FindVector - searches the exists list for a vector of type
which is associated with file descriptor, fd.
*)
PROCEDURE FindVector (fd: INTEGER; t: VectorType) : Vector ;
PROCEDURE FindVector (fd: INTEGER; type: VectorType) : Vector ;
VAR
v: Vector ;
vec: Vector ;
BEGIN
v := Exists ;
WHILE v#NIL DO
IF (v^.type=t) AND (v^.File=fd)
vec := Exists ;
WHILE vec#NIL DO
IF (vec^.type=type) AND (vec^.File=fd)
THEN
RETURN v
RETURN vec
END ;
v := v^.exists
vec := vec^.exists
END ;
RETURN NIL
END FindVector ;
@ -124,19 +124,19 @@ END FindVector ;
PROCEDURE InitInputVector (fd: INTEGER; pri: CARDINAL) : CARDINAL ;
VAR
v: Vector ;
vptr: Vector ;
BEGIN
IF Debugging
THEN
printf("InitInputVector fd = %d priority = %d\n", fd, pri)
END ;
wait (lock) ;
v := FindVector(fd, input) ;
IF v=NIL
vptr := FindVector(fd, input) ;
IF vptr = NIL
THEN
NEW(v) ;
INC(VecNo) ;
WITH v^ DO
NEW (vptr) ;
INC (VecNo) ;
WITH vptr^ DO
type := input ;
priority := pri ;
arg := NIL ;
@ -145,12 +145,12 @@ BEGIN
no := VecNo ;
File := fd
END ;
Exists := v ;
Exists := vptr ;
signal (lock) ;
RETURN VecNo
ELSE
signal (lock) ;
RETURN v^.no
RETURN vptr^.no
END
END InitInputVector ;
@ -162,19 +162,19 @@ END InitInputVector ;
PROCEDURE InitOutputVector (fd: INTEGER; pri: CARDINAL) : CARDINAL ;
VAR
v: Vector ;
vptr: Vector ;
BEGIN
wait (lock) ;
v := FindVector (fd, output) ;
IF v=NIL
vptr := FindVector (fd, output) ;
IF vptr = NIL
THEN
NEW (v) ;
IF v = NIL
NEW (vptr) ;
IF vptr = NIL
THEN
HALT
ELSE
INC (VecNo) ;
WITH v^ DO
WITH vptr^ DO
type := output ;
priority := pri ;
arg := NIL ;
@ -183,13 +183,13 @@ BEGIN
no := VecNo ;
File := fd
END ;
Exists := v ;
Exists := vptr ;
signal (lock) ;
RETURN VecNo
END
ELSE
signal (lock) ;
RETURN v^.no
RETURN vptr^.no
END
END InitOutputVector ;
@ -201,28 +201,28 @@ END InitOutputVector ;
PROCEDURE InitTimeVector (micro, secs: CARDINAL; pri: CARDINAL) : CARDINAL ;
VAR
v: Vector ;
vptr: Vector ;
BEGIN
wait (lock) ;
NEW (v) ;
IF v = NIL
NEW (vptr) ;
IF vptr = NIL
THEN
HALT
ELSE
INC (VecNo) ;
Assert (micro<Microseconds) ;
WITH v^ DO
WITH vptr^ DO
type := time ;
priority := pri ;
arg := NIL ;
pending := NIL ;
exists := Exists ;
no := VecNo ;
rel := InitTime(secs+DebugTime, micro) ;
abs := InitTime(0, 0) ;
rel := InitTime (secs+DebugTime, micro) ;
abs := InitTime (0, 0) ;
queued := FALSE
END ;
Exists := v
Exists := vptr
END ;
signal (lock) ;
RETURN VecNo
@ -230,18 +230,18 @@ END InitTimeVector ;
(*
FindVectorNo - searches the Exists list for vector, vec.
FindVectorNo - searches the Exists list for vector vec.
*)
PROCEDURE FindVectorNo (vec: CARDINAL) : Vector ;
VAR
v: Vector ;
vptr: Vector ;
BEGIN
v := Exists ;
WHILE (v#NIL) AND (v^.no#vec) DO
v := v^.exists
vptr := Exists ;
WHILE (vptr#NIL) AND (vptr^.no#vec) DO
vptr := vptr^.exists
END ;
RETURN v
RETURN vptr
END FindVectorNo ;
@ -251,17 +251,17 @@ END FindVectorNo ;
PROCEDURE FindPendingVector (vec: CARDINAL) : Vector ;
VAR
i: CARDINAL ;
v: Vector ;
pri : CARDINAL ;
vptr: Vector ;
BEGIN
FOR i := MIN(PROTECTION) TO MAX(PROTECTION) DO
v := Pending[i] ;
WHILE (v#NIL) AND (v^.no#vec) DO
v := v^.pending
FOR pri := MIN(PROTECTION) TO MAX(PROTECTION) DO
vptr := Pending[pri] ;
WHILE (vptr#NIL) AND (vptr^.no#vec) DO
vptr := vptr^.pending
END ;
IF (v#NIL) AND (v^.no=vec)
IF (vptr#NIL) AND (vptr^.no=vec)
THEN
RETURN v
RETURN vptr
END
END ;
RETURN NIL
@ -276,17 +276,17 @@ END FindPendingVector ;
PROCEDURE ReArmTimeVector (vec: CARDINAL;
micro, secs: CARDINAL) ;
VAR
v: Vector ;
vptr: Vector ;
BEGIN
Assert(micro<Microseconds) ;
Assert (micro<Microseconds) ;
wait (lock) ;
v := FindVectorNo(vec) ;
IF v=NIL
vptr := FindVectorNo (vec) ;
IF vptr = NIL
THEN
Halt(__FILE__, __LINE__, __FUNCTION__,
'cannot find vector supplied')
Halt (__FILE__, __LINE__, __FUNCTION__,
'cannot find vector supplied')
ELSE
WITH v^ DO
WITH vptr^ DO
SetTime (rel, secs + DebugTime, micro)
END
END ;
@ -303,16 +303,16 @@ END ReArmTimeVector ;
PROCEDURE GetTimeVector (vec: CARDINAL; VAR micro, secs: CARDINAL) ;
VAR
v: Vector ;
vptr: Vector ;
BEGIN
wait (lock) ;
v := FindVectorNo (vec) ;
IF v=NIL
vptr := FindVectorNo (vec) ;
IF vptr=NIL
THEN
Halt(__FILE__, __LINE__, __FUNCTION__,
'cannot find vector supplied')
Halt (__FILE__, __LINE__, __FUNCTION__,
'cannot find vector supplied')
ELSE
WITH v^ DO
WITH vptr^ DO
GetTime (rel, secs, micro) ;
Assert (micro < Microseconds)
END
@ -322,31 +322,31 @@ END GetTimeVector ;
(*
AttachVector - adds the pointer, p, to be associated with the interrupt
AttachVector - adds the pointer ptr to be associated with the interrupt
vector. It returns the previous value attached to this
vector.
*)
PROCEDURE AttachVector (vec: CARDINAL; p: ADDRESS) : ADDRESS ;
PROCEDURE AttachVector (vec: CARDINAL; ptr: ADDRESS) : ADDRESS ;
VAR
v: Vector ;
l: ADDRESS ;
vptr : Vector ;
prevArg: ADDRESS ;
BEGIN
wait (lock) ;
v := FindVectorNo (vec) ;
IF v=NIL
vptr := FindVectorNo (vec) ;
IF vptr = NIL
THEN
Halt (__FILE__, __LINE__, __FUNCTION__, 'cannot find vector supplied')
ELSE
l := v^.arg ;
v^.arg := p ;
prevArg := vptr^.arg ;
vptr^.arg := ptr ;
IF Debugging
THEN
printf ("AttachVector %d with 0x%x\n", vec, p);
printf ("AttachVector %d with %p\n", vec, ptr);
DumpPendingQueue ;
END ;
signal (lock) ;
RETURN l
RETURN prevArg
END
END AttachVector ;
@ -358,42 +358,41 @@ END AttachVector ;
PROCEDURE IncludeVector (vec: CARDINAL) ;
VAR
v : Vector ;
m, s: CARDINAL ;
r : INTEGER ;
vptr : Vector ;
micro, sec: CARDINAL ;
result : INTEGER ;
BEGIN
wait (lock) ;
v := FindPendingVector (vec) ;
IF v=NIL
vptr := FindPendingVector (vec) ;
IF vptr = NIL
THEN
v := FindVectorNo (vec) ;
IF v = NIL
vptr := FindVectorNo (vec) ;
IF vptr = NIL
THEN
Halt (__FILE__, __LINE__, __FUNCTION__,
'cannot find vector supplied') ;
ELSE
(* printf('including vector %d (fd = %d)\n', vec, v^.File) ; *)
v^.pending := Pending[v^.priority] ;
Pending[v^.priority] := v ;
IF (v^.type = time) AND (NOT v^.queued)
vptr^.pending := Pending[vptr^.priority] ;
Pending[vptr^.priority] := vptr ;
IF (vptr^.type = time) AND (NOT vptr^.queued)
THEN
v^.queued := TRUE ;
r := GetTimeOfDay (v^.abs) ;
Assert (r=0) ;
GetTime (v^.abs, s, m) ;
Assert (m<Microseconds) ;
AddTime (v^.abs, v^.rel) ;
GetTime (v^.abs, s, m) ;
Assert (m<Microseconds)
vptr^.queued := TRUE ;
result := GetTimeOfDay (vptr^.abs) ;
Assert (result=0) ;
GetTime (vptr^.abs, sec, micro) ;
Assert (micro<Microseconds) ;
AddTime (vptr^.abs, vptr^.rel) ;
GetTime (vptr^.abs, sec, micro) ;
Assert (micro<Microseconds)
END
END
ELSE
IF Debugging
THEN
printf ('odd vector (%d) type (%d) arg (0x%x) is already attached to the pending queue\n',
vec, v^.type, v^.arg)
END ;
stop
printf ('odd vector (%d) type (%d) arg (%p) is already attached to the pending queue\n',
vec, vptr^.type, vptr^.arg)
END
END ;
signal (lock)
END IncludeVector ;
@ -406,29 +405,29 @@ END IncludeVector ;
PROCEDURE ExcludeVector (vec: CARDINAL) ;
VAR
v, u: Vector ;
vptr, uptr: Vector ;
BEGIN
wait (lock) ;
v := FindPendingVector(vec) ;
IF v=NIL
vptr := FindPendingVector (vec) ;
IF vptr = NIL
THEN
Halt (__FILE__, __LINE__, __FUNCTION__,
'cannot find pending vector supplied')
ELSE
(* printf('excluding vector %d\n', vec) ; *)
IF Pending[v^.priority]=v
IF Pending[vptr^.priority] = vptr
THEN
Pending[v^.priority] := Pending[v^.priority]^.pending
Pending[vptr^.priority] := Pending[vptr^.priority]^.pending
ELSE
u := Pending[v^.priority] ;
WHILE u^.pending#v DO
u := u^.pending
uptr := Pending[vptr^.priority] ;
WHILE uptr^.pending#vptr DO
uptr := uptr^.pending
END ;
u^.pending := v^.pending
uptr^.pending := vptr^.pending
END ;
IF v^.type=time
IF vptr^.type=time
THEN
v^.queued := FALSE
vptr^.queued := FALSE
END
END ;
signal (lock)
@ -436,18 +435,18 @@ END ExcludeVector ;
(*
AddFd - adds the file descriptor, fd, to set, s, updating, max.
AddFd - adds the file descriptor fd to set updating max.
*)
PROCEDURE AddFd (VAR s: SetOfFd; VAR max: INTEGER; fd: INTEGER) ;
PROCEDURE AddFd (VAR set: SetOfFd; VAR max: INTEGER; fd: INTEGER) ;
BEGIN
max := Max (fd, max) ;
IF s = NIL
IF set = NIL
THEN
s := InitSet () ;
FdZero (s)
set := InitSet () ;
FdZero (set)
END ;
FdSet (fd, s)
FdSet (fd, set)
(* printf('%d, ', fd) *)
END AddFd ;
@ -458,36 +457,33 @@ END AddFd ;
PROCEDURE DumpPendingQueue ;
VAR
p : PROTECTION ;
v : Vector ;
s, m: CARDINAL ;
pri : PROTECTION ;
vptr : Vector ;
sec,
micro: CARDINAL ;
BEGIN
printf ("Pending queue\n");
FOR p := MIN (PROTECTION) TO MAX (PROTECTION) DO
printf ("[%d] ", p);
v := Pending[p] ;
WHILE v#NIL DO
IF (v^.type=input) OR (v^.type=output)
FOR pri := MIN (PROTECTION) TO MAX (PROTECTION) DO
printf ("[%d] ", pri);
vptr := Pending[pri] ;
WHILE vptr # NIL DO
IF (vptr^.type=input) OR (vptr^.type=output)
THEN
printf ("(fd=%d) (vec=%d)", v^.File, v^.no)
ELSIF v^.type=time
printf ("(fd=%d) (vec=%d)", vptr^.File, vptr^.no)
ELSIF vptr^.type=time
THEN
GetTime(v^.rel, s, m) ;
Assert (m<Microseconds) ;
printf ("time (%u.%06u secs) (arg = 0x%x)\n", s, m, v^.arg)
GetTime (vptr^.rel, sec, micro) ;
Assert (micro < Microseconds) ;
printf ("time (%u.%06u secs) (arg = %p)\n",
sec, micro, vptr^.arg)
END ;
v := v^.pending
vptr := vptr^.pending
END ;
printf (" \n")
END
END DumpPendingQueue ;
PROCEDURE stop ;
BEGIN
END stop ;
(*
AddTime - t1 := t1 + t2
*)
@ -565,63 +561,64 @@ END SubTime ;
*)
PROCEDURE activatePending (untilInterrupt: BOOLEAN; call: DispatchVector; pri: CARDINAL;
maxFd: INTEGER; VAR i, o: SetOfFd; VAR t: Timeval; b4, after: Timeval) : BOOLEAN ;
maxFd: INTEGER; VAR inSet, outSet: SetOfFd; VAR timeval: Timeval; b4, after: Timeval) : BOOLEAN ;
VAR
r : INTEGER ;
p : CARDINAL ;
v : Vector ;
result: INTEGER ;
p : CARDINAL ;
vec : Vector ;
b4s,
b4m,
afs,
afm,
s, m: CARDINAL ;
sec,
micro : CARDINAL ;
BEGIN
wait (lock) ;
p := MAX (PROTECTION) ;
WHILE p > pri DO
v := Pending[p] ;
WHILE v # NIL DO
WITH v^ DO
vec := Pending[p] ;
WHILE vec # NIL DO
WITH vec^ DO
CASE type OF
input : IF (File < maxFd) AND (i # NIL) AND FdIsSet (File, i)
input : IF (File < maxFd) AND (inSet # NIL) AND FdIsSet (File, inSet)
THEN
IF Debugging
THEN
printf ('read (fd=%d) is ready (vec=%d)\n', File, no) ;
DumpPendingQueue
END ;
FdClr (File, i) ; (* so we dont activate this again from our select. *)
FdClr (File, inSet) ; (* so we dont activate this again from our select. *)
signal (lock) ;
call (no, priority, arg) ;
RETURN TRUE
END |
output: IF (File < maxFd) AND (o#NIL) AND FdIsSet (File, o)
output: IF (File < maxFd) AND (outSet#NIL) AND FdIsSet (File, outSet)
THEN
IF Debugging
THEN
printf ('write (fd=%d) is ready (vec=%d)\n', File, no) ;
DumpPendingQueue
END ;
FdClr (File, o) ; (* so we dont activate this again from our select. *)
FdClr (File, outSet) ; (* so we dont activate this again from our select. *)
signal (lock) ;
call (no, priority, arg) ;
RETURN TRUE
END |
time : IF untilInterrupt AND (t # NIL)
time : IF untilInterrupt AND (timeval # NIL)
THEN
r := GetTimeOfDay (after) ;
Assert (r=0) ;
result := GetTimeOfDay (after) ;
Assert (result=0) ;
IF Debugging
THEN
GetTime (t, s, m) ;
Assert (m < Microseconds) ;
GetTime (timeval, sec, micro) ;
Assert (micro < Microseconds) ;
GetTime (after, afs, afm) ;
Assert (afm < Microseconds) ;
GetTime (b4, b4s, b4m) ;
Assert (b4m < Microseconds) ;
printf ("waited %u.%06u + %u.%06u now is %u.%06u\n",
s, m, b4s, b4m, afs, afm) ;
sec, micro, b4s, b4m, afs, afm) ;
END ;
IF IsGreaterEqual (after, abs)
THEN
@ -630,7 +627,7 @@ BEGIN
DumpPendingQueue ;
printf ("time has expired calling dispatcher\n")
END ;
t := KillTime (t) ; (* so we dont activate this again from our select. *)
timeval := KillTime (timeval) ; (* so we dont activate this again from our select. *)
signal (lock) ;
IF Debugging
THEN
@ -645,7 +642,7 @@ BEGIN
END
END
END ;
v := v^.pending
vec := vec^.pending
END ;
DEC (p)
END ;
@ -667,20 +664,22 @@ PROCEDURE Listen (untilInterrupt: BOOLEAN;
call: DispatchVector;
pri: CARDINAL) ;
VAR
found: BOOLEAN ;
r : INTEGER ;
found : BOOLEAN ;
result : INTEGER ;
after,
b4,
t : Timeval ;
v : Vector ;
i, o : SetOfFd ;
timeval: Timeval ;
vec : Vector ;
inSet,
outSet : SetOfFd ;
b4s,
b4m,
afs,
afm,
s, m : CARDINAL ;
maxFd: INTEGER ;
p : CARDINAL ;
sec,
micro : CARDINAL ;
maxFd : INTEGER ;
p : CARDINAL ;
BEGIN
wait (lock) ;
IF pri < MAX (PROTECTION)
@ -690,120 +689,120 @@ BEGIN
DumpPendingQueue
END ;
maxFd := -1 ;
t := NIL ;
i := NIL ;
o := NIL ;
t := InitTime (MAX (INTEGER), 0) ;
timeval := NIL ;
inSet := NIL ;
outSet := NIL ;
timeval := InitTime (MAX (INTEGER), 0) ;
p := MAX (PROTECTION) ;
found := FALSE ;
WHILE p>pri DO
v := Pending[p] ;
WHILE v#NIL DO
WITH v^ DO
vec := Pending[p] ;
WHILE vec#NIL DO
WITH vec^ DO
CASE type OF
input : AddFd (i, maxFd, File) |
output: AddFd (o, maxFd, File) |
time : IF IsGreaterEqual (t, abs)
input : AddFd (inSet, maxFd, File) |
output: AddFd (outSet, maxFd, File) |
time : IF IsGreaterEqual (timeval, abs)
THEN
GetTime (abs, s, m) ;
Assert (m<Microseconds) ;
GetTime (abs, sec, micro) ;
Assert (micro < Microseconds) ;
IF Debugging
THEN
printf ("shortest delay is %u.%06u\n", s, m)
printf ("shortest delay is %u.%06u\n", sec, micro)
END ;
SetTime (t, s, m) ;
SetTime (timeval, sec, micro) ;
found := TRUE
END
END
END ;
v := v^.pending
vec := vec^.pending
END ;
DEC (p)
END ;
IF NOT untilInterrupt
THEN
SetTime (t, 0, 0)
SetTime (timeval, 0, 0)
END ;
IF untilInterrupt AND (i=NIL) AND (o=NIL) AND (NOT found)
IF untilInterrupt AND (inSet=NIL) AND (outSet=NIL) AND (NOT found)
THEN
Halt (__FILE__, __LINE__, __FUNCTION__,
'deadlock found, no more processes to run and no interrupts active')
END ;
(* printf('timeval = 0x%x\n', t) ; *)
(* printf('timeval = 0x%x\n', timeval) ; *)
(* printf('}\n') ; *)
IF (NOT found) AND (maxFd=-1) AND (i=NIL) AND (o=NIL)
IF (NOT found) AND (maxFd=-1) AND (inSet=NIL) AND (outSet=NIL)
THEN
(* no file descriptors to be selected upon. *)
t := KillTime (t) ;
timeval := KillTime (timeval) ;
signal (lock) ;
RETURN
ELSE
GetTime (t, s, m) ;
Assert (m<Microseconds) ;
GetTime (timeval, sec, micro) ;
Assert (micro < Microseconds) ;
b4 := InitTime (0, 0) ;
after := InitTime (0, 0) ;
r := GetTimeOfDay (b4) ;
Assert (r=0) ;
SubTime (s, m, t, b4) ;
SetTime (t, s, m) ;
result := GetTimeOfDay (b4) ;
Assert (result=0) ;
SubTime (sec, micro, timeval, b4) ;
SetTime (timeval, sec, micro) ;
IF Debugging
THEN
printf ("select waiting for %u.%06u seconds\n", s, m)
printf ("select waiting for %u.%06u seconds\n", sec, micro)
END ;
signal (lock) ;
REPEAT
IF Debugging
THEN
printf ("select (.., .., .., %u.%06u)\n", s, m)
printf ("select (.., .., .., %u.%06u)\n", sec, micro)
END ;
r := select (maxFd+1, i, o, NIL, t) ;
IF r=-1
result := select (maxFd+1, inSet, outSet, NIL, timeval) ;
IF result=-1
THEN
perror ("select") ;
r := select (maxFd+1, i, o, NIL, NIL) ;
IF r=-1
result := select (maxFd+1, inSet, outSet, NIL, NIL) ;
IF result=-1
THEN
perror ("select timeout argument is faulty")
END ;
r := select (maxFd+1, i, NIL, NIL, t) ;
IF r=-1
result := select (maxFd+1, inSet, NIL, NIL, timeval) ;
IF result=-1
THEN
perror ("select output fd argument is faulty")
END ;
r := select (maxFd+1, NIL, o, NIL, t) ;
IF r=-1
result := select (maxFd+1, NIL, outSet, NIL, timeval) ;
IF result=-1
THEN
perror ("select input fd argument is faulty")
ELSE
perror ("select maxFD+1 argument is faulty")
END
END
UNTIL r#-1
UNTIL result#-1
END ;
WHILE activatePending (untilInterrupt, call, pri,
maxFd+1, i, o, t, b4, after) DO
maxFd+1, inSet, outSet, timeval, b4, after) DO
END ;
IF t#NIL
IF timeval#NIL
THEN
t := KillTime (t)
timeval := KillTime (timeval)
END ;
IF after#NIL
THEN
t := KillTime (after)
after := KillTime (after)
END ;
IF b4#NIL
THEN
t := KillTime (b4)
b4 := KillTime (b4)
END ;
IF i#NIL
IF inSet#NIL
THEN
i := KillSet (i)
inSet := KillSet (inSet)
END ;
IF o#NIL
IF outSet#NIL
THEN
o := KillSet (o)
outSet := KillSet (outSet)
END
END ;
signal (lock)

10
gcc/m2/gm2-libs/libc.def
View file

@ -42,7 +42,8 @@ EXPORT UNQUALIFIED time_t, timeb, tm, ptrToTM,
memcpy, memset, memmove, printf, realloc,
rand, srand,
time, localtime, ftime,
shutdown, rename, setjmp, longjmp, atexit,
shutdown, snprintf,
rename, setjmp, longjmp, atexit,
ttyname, sleep, execv ;
@ -360,6 +361,13 @@ PROCEDURE memmove (dest, src: ADDRESS; size: CSIZE_T) : [ ADDRESS ] ;
PROCEDURE printf (format: ARRAY OF CHAR; ...) : [ INTEGER ] ;
(*
int snprintf(char *str, size_t size, const char *format, ...);
*)
PROCEDURE snprintf (dest: ADDRESS; size: CSIZE_T;
format: ARRAY OF CHAR; ...) : [ INTEGER ] ;
(*
setenv - sets environment variable, name, to value.
It will overwrite an existing value if, overwrite,

16
gcc/m2/gm2-libs/sckt.def
View file

@ -27,14 +27,14 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
DEFINITION MODULE sckt ;
FROM SYSTEM IMPORT ADDRESS ;
EXPORT UNQUALIFIED tcpServerState,
tcpServerEstablish, tcpServerEstablishPort,
tcpServerAccept, getLocalIP,
tcpServerPortNo, tcpServerIP, tcpServerSocketFd,
tcpServerClientIP, tcpServerClientPortNo,
tcpClientState,
tcpClientSocket, tcpClientSocketIP, tcpClientConnect,
tcpClientPortNo, tcpClientIP, tcpClientSocketFd ;
EXPORT QUALIFIED tcpServerState,
tcpServerEstablish, tcpServerEstablishPort,
tcpServerAccept, getLocalIP,
tcpServerPortNo, tcpServerIP, tcpServerSocketFd,
tcpServerClientIP, tcpServerClientPortNo,
tcpClientState,
tcpClientSocket, tcpClientSocketIP, tcpClientConnect,
tcpClientPortNo, tcpClientIP, tcpClientSocketFd ;
TYPE
tcpServerState = ADDRESS ;

64
gcc/m2/gm2spec.cc
View file

@ -31,6 +31,8 @@ along with GNU Modula-2; see the file COPYING3. If not see
#include "gcc.h"
#include "opts.h"
#include "vec.h"
#include <vector>
#include <string>
#include "m2/gm2config.h"
@ -149,7 +151,40 @@ static void append_arg (const struct cl_decoded_option *);
static unsigned int gm2_newargc;
static struct cl_decoded_option *gm2_new_decoded_options;
static const char *libraries = NULL; /* Abbreviated libraries. */
static const char *m2_path_name = "";
typedef struct named_path_s {
std::vector<const char*>path;
const char *name;
} named_path;
static std::vector<named_path>Ipaths;
static void
push_back_Ipath (const char *arg)
{
if (Ipaths.empty ())
{
named_path np;
np.path.push_back (arg);
np.name = m2_path_name;
Ipaths.push_back (np);
}
else
{
if (strcmp (Ipaths.back ().name,
m2_path_name) == 0)
Ipaths.back ().path.push_back (arg);
else
{
named_path np;
np.path.push_back (arg);
np.name = m2_path_name;
Ipaths.push_back (np);
}
}
}
/* Return whether strings S1 and S2 are both NULL or both the same
string. */
@ -342,6 +377,24 @@ convert_abbreviations (const char *libraries)
return full_libraries;
}
/* add_m2_I_path appends -fm2-pathname and -fm2-pathnameI options to
the command line which are contructed in the saved Ipaths. */
static void
add_m2_I_path (void)
{
for (auto np : Ipaths)
{
if (strcmp (np.name, "") == 0)
append_option (OPT_fm2_pathname_, safe_strdup ("-"), 1);
else
append_option (OPT_fm2_pathname_, safe_strdup (np.name), 1);
for (auto *s : np.path)
append_option (OPT_fm2_pathnameI, safe_strdup (s), 1);
}
Ipaths.clear();
}
void
lang_specific_driver (struct cl_decoded_option **in_decoded_options,
@ -429,6 +482,7 @@ lang_specific_driver (struct cl_decoded_option **in_decoded_options,
fprintf (stderr, "\n");
#endif
// add_spec_function ("m2I", add_m2_I_path);
gm2_xargc = argc;
gm2_x_decoded_options = decoded_options;
gm2_newargc = 0;
@ -514,7 +568,14 @@ lang_specific_driver (struct cl_decoded_option **in_decoded_options,
seen_uselist = true;
uselist = decoded_options[i].value;
break;
case OPT_fm2_pathname_:
args[i] |= SKIPOPT; /* We will add the option if it is needed. */
m2_path_name = decoded_options[i].arg;
break;
case OPT_I:
args[i] |= SKIPOPT; /* We will add the option if it is needed. */
push_back_Ipath (decoded_options[i].arg);
break;
case OPT_nostdlib:
case OPT_nostdlib__:
case OPT_nodefaultlibs:
@ -670,6 +731,7 @@ lang_specific_driver (struct cl_decoded_option **in_decoded_options,
#endif
}
add_m2_I_path ();
/* We now add in extra arguments to facilitate a successful link.
Note that the libraries are added to the end of the link here
and also placed earlier into the link by lang-specs.h. Possibly

7
gcc/m2/lang-specs.h
View file

@ -41,9 +41,9 @@ along with GCC; see the file COPYING3. If not see
{"@modula-2",
/* For preprocessing we use cc1 but wrap it in cc1gm2. */
"%{E|M|MM:\
cc1gm2 " M2CPP " %{!fcpp:-fcpp;:%{fcpp}} %{I*} %i } \
cc1gm2 " M2CPP " %{!fcpp:-fcpp;:%{fcpp}} %{fm2-pathname*} %i } \
%{!E:%{!M:%{!MM:\
cc1gm2 " M2CPP " %(cc1_options) %{I*} %i %{c} \
cc1gm2 " M2CPP " %(cc1_options) %{fm2-pathname*} %i %{c} \
%{!fcpp:%{MD|MMD|MF*: \
%eto generate dependencies you must specify '-fcpp' }} \
%{!fsyntax-only:%(invoke_as)} \
@ -51,6 +51,7 @@ along with GCC; see the file COPYING3. If not see
{".m2i", "@modula-2-cpp-output", 0, 0, 0},
{"@modula-2-cpp-output",
"%{!M:%{!MM:%{!E: \
cc1gm2 %<fcpp %(cc1_options) %{v} %I -fmod=.mod.m2i -fdef=.def.m2i %{I*} \
cc1gm2 %<fcpp %(cc1_options) %{v} %I -fmod=.mod.m2i -fdef=.def.m2i \
%{fm2-pathname*} \
-fpreprocessed %i %{c} \
%{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0},

14
gcc/m2/lang.opt
View file

@ -134,9 +134,21 @@ fm2-lower-case
Modula-2
generate error messages which render keywords in lower case
fm2-pathname=
Modula-2 Joined
specify the module mangled prefix name for all modules in the following include paths
fm2-pathnameI
Modula-2 Joined
; For internal use only: used by the driver to copy the user facing -I option
fm2-plugin
Modula-2
insert plugin to identify runtime errors at compiletime (default on)
insert plugin to identify runtime errors at compiletime
fm2-prefix=
Modula-2 Joined
specify the module mangled prefix name
fm2-statistics
Modula-2

4
gcc/m2/mc-boot-ch/GUnixArgs.cc
View file

@ -25,7 +25,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
<http://www.gnu.org/licenses/>. */
#include <config.h>
#include "m2rts.h"
// #include "m2rts.h"
extern "C" int UnixArgs_GetArgC (void);
@ -82,6 +82,7 @@ _M2_UnixArgs_dep (void)
{
}
#if 0
struct _M2_UnixArgs_ctor { _M2_UnixArgs_ctor (); } _M2_UnixArgs_ctor;
_M2_UnixArgs_ctor::_M2_UnixArgs_ctor (void)
@ -89,3 +90,4 @@ _M2_UnixArgs_ctor::_M2_UnixArgs_ctor (void)
M2RTS_RegisterModule ("UnixArgs", _M2_UnixArgs_init, _M2_UnixArgs_fini,
_M2_UnixArgs_dep);
}
#endif

36
gcc/m2/mc-boot-ch/Glibc.c
View file

@ -125,7 +125,43 @@ libc_printf (char *_format, unsigned int _format_high, ...)
va_start (arg, _format_high);
done = vfprintf (stdout, format, arg);
va_end (arg);
return done;
}
EXTERN
int
libc_snprintf (char *dest, size_t length, char *_format, unsigned int _format_high, ...)
{
va_list arg;
int done;
char format[_format_high + 1];
unsigned int i = 0;
unsigned int j = 0;
char *c;
do
{
c = index (&_format[i], '\\');
if (c == NULL)
strcpy (&format[j], &_format[i]);
else
{
memcpy (&format[j], &_format[i], (c - _format) - i);
i = c - _format;
j += c - _format;
if (_format[i + 1] == 'n')
format[j] = '\n';
else
format[j] = _format[i + 1];
j++;
i += 2;
}
}
while (c != NULL);
va_start (arg, _format_high);
done = vsnprintf (dest, length, format, arg);
va_end (arg);
return done;
}

5
gcc/m2/mc-boot-ch/m2rts.h
View file

@ -28,8 +28,9 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
typedef void (*proc_con) (int, char **, char **);
typedef void (*proc_dep) (void);
extern "C" void M2RTS_RequestDependant (const char *modulename, const char *dependancy);
extern "C" void M2RTS_RegisterModule (const char *modulename,
extern "C" void M2RTS_RequestDependant (const char *modulename, const char *libname,
const char *dependancy, const char *deplib);
extern "C" void M2RTS_RegisterModule (const char *modulename, const char *libname,
proc_con init, proc_con fini, proc_dep dependencies);
extern "C" void _M2_M2RTS_init (void);

32
gcc/m2/mc-boot/GDynamicStrings.c
View file

@ -1214,7 +1214,7 @@ static void ConcatContents (DynamicStrings_Contents *c, const char *a_, unsigned
(*c).next->contents.next = NULL;
ConcatContents (&(*c).next->contents, (const char *) a, _a_high, h, o);
AddDebugInfo ((*c).next);
(*c).next = AssignDebug ((*c).next, (const char *) "../../gcc-read-write/gcc/m2/gm2-libs/DynamicStrings.mod", 55, 722, (const char *) "ConcatContents", 14);
(*c).next = AssignDebug ((*c).next, (const char *) "../../gcc/m2/gm2-libs/DynamicStrings.mod", 40, 722, (const char *) "ConcatContents", 14);
}
else
{
@ -1312,7 +1312,7 @@ static void ConcatContentsAddress (DynamicStrings_Contents *c, void * a, unsigne
AddDebugInfo ((*c).next);
if (TraceOn)
{
(*c).next = AssignDebug ((*c).next, (const char *) "../../gcc-read-write/gcc/m2/gm2-libs/DynamicStrings.mod", 55, 917, (const char *) "ConcatContentsAddress", 21);
(*c).next = AssignDebug ((*c).next, (const char *) "../../gcc/m2/gm2-libs/DynamicStrings.mod", 40, 917, (const char *) "ConcatContentsAddress", 21);
}
}
else
@ -1537,7 +1537,7 @@ extern "C" DynamicStrings_String DynamicStrings_InitString (const char *a_, unsi
AddDebugInfo (s);
if (TraceOn)
{
s = AssignDebug (s, (const char *) "../../gcc-read-write/gcc/m2/gm2-libs/DynamicStrings.mod", 55, 758, (const char *) "InitString", 10);
s = AssignDebug (s, (const char *) "../../gcc/m2/gm2-libs/DynamicStrings.mod", 40, 758, (const char *) "InitString", 10);
}
return s;
/* static analysis guarentees a RETURN statement will be used before here. */
@ -1640,7 +1640,7 @@ extern "C" DynamicStrings_String DynamicStrings_InitStringCharStar (void * a)
AddDebugInfo (s);
if (TraceOn)
{
s = AssignDebug (s, (const char *) "../../gcc-read-write/gcc/m2/gm2-libs/DynamicStrings.mod", 55, 957, (const char *) "InitStringCharStar", 18);
s = AssignDebug (s, (const char *) "../../gcc/m2/gm2-libs/DynamicStrings.mod", 40, 957, (const char *) "InitStringCharStar", 18);
}
return s;
/* static analysis guarentees a RETURN statement will be used before here. */
@ -1665,7 +1665,7 @@ extern "C" DynamicStrings_String DynamicStrings_InitStringChar (char ch)
s = DynamicStrings_InitString ((const char *) &a.array[0], 1);
if (TraceOn)
{
s = AssignDebug (s, (const char *) "../../gcc-read-write/gcc/m2/gm2-libs/DynamicStrings.mod", 55, 977, (const char *) "InitStringChar", 14);
s = AssignDebug (s, (const char *) "../../gcc/m2/gm2-libs/DynamicStrings.mod", 40, 977, (const char *) "InitStringChar", 14);
}
return s;
/* static analysis guarentees a RETURN statement will be used before here. */
@ -1823,7 +1823,7 @@ extern "C" DynamicStrings_String DynamicStrings_Dup (DynamicStrings_String s)
s = DynamicStrings_Assign (DynamicStrings_InitString ((const char *) "", 0), s);
if (TraceOn)
{
s = AssignDebug (s, (const char *) "../../gcc-read-write/gcc/m2/gm2-libs/DynamicStrings.mod", 55, 1173, (const char *) "Dup", 3);
s = AssignDebug (s, (const char *) "../../gcc/m2/gm2-libs/DynamicStrings.mod", 40, 1173, (const char *) "Dup", 3);
}
return s;
/* static analysis guarentees a RETURN statement will be used before here. */
@ -1845,7 +1845,7 @@ extern "C" DynamicStrings_String DynamicStrings_Add (DynamicStrings_String a, Dy
a = DynamicStrings_ConCat (DynamicStrings_ConCat (DynamicStrings_InitString ((const char *) "", 0), a), b);
if (TraceOn)
{
a = AssignDebug (a, (const char *) "../../gcc-read-write/gcc/m2/gm2-libs/DynamicStrings.mod", 55, 1193, (const char *) "Add", 3);
a = AssignDebug (a, (const char *) "../../gcc/m2/gm2-libs/DynamicStrings.mod", 40, 1193, (const char *) "Add", 3);
}
return a;
/* static analysis guarentees a RETURN statement will be used before here. */
@ -1910,7 +1910,7 @@ extern "C" unsigned int DynamicStrings_EqualCharStar (DynamicStrings_String s, v
t = DynamicStrings_InitStringCharStar (a);
if (TraceOn)
{
t = AssignDebug (t, (const char *) "../../gcc-read-write/gcc/m2/gm2-libs/DynamicStrings.mod", 55, 1250, (const char *) "EqualCharStar", 13);
t = AssignDebug (t, (const char *) "../../gcc/m2/gm2-libs/DynamicStrings.mod", 40, 1250, (const char *) "EqualCharStar", 13);
}
t = AddToGarbage (t, s);
if (DynamicStrings_Equal (t, s))
@ -1948,7 +1948,7 @@ extern "C" unsigned int DynamicStrings_EqualArray (DynamicStrings_String s, cons
t = DynamicStrings_InitString ((const char *) a, _a_high);
if (TraceOn)
{
t = AssignDebug (t, (const char *) "../../gcc-read-write/gcc/m2/gm2-libs/DynamicStrings.mod", 55, 1280, (const char *) "EqualArray", 10);
t = AssignDebug (t, (const char *) "../../gcc/m2/gm2-libs/DynamicStrings.mod", 40, 1280, (const char *) "EqualArray", 10);
}
t = AddToGarbage (t, s);
if (DynamicStrings_Equal (t, s))
@ -1986,7 +1986,7 @@ extern "C" DynamicStrings_String DynamicStrings_Mult (DynamicStrings_String s, u
}
if (TraceOn)
{
s = AssignDebug (s, (const char *) "../../gcc-read-write/gcc/m2/gm2-libs/DynamicStrings.mod", 55, 1312, (const char *) "Mult", 4);
s = AssignDebug (s, (const char *) "../../gcc/m2/gm2-libs/DynamicStrings.mod", 40, 1312, (const char *) "Mult", 4);
}
return s;
/* static analysis guarentees a RETURN statement will be used before here. */
@ -2065,7 +2065,7 @@ extern "C" DynamicStrings_String DynamicStrings_Slice (DynamicStrings_String s,
AddDebugInfo (t->contents.next);
if (TraceOn)
{
t->contents.next = AssignDebug (t->contents.next, (const char *) "../../gcc-read-write/gcc/m2/gm2-libs/DynamicStrings.mod", 55, 1380, (const char *) "Slice", 5);
t->contents.next = AssignDebug (t->contents.next, (const char *) "../../gcc/m2/gm2-libs/DynamicStrings.mod", 40, 1380, (const char *) "Slice", 5);
}
}
t = t->contents.next;
@ -2083,7 +2083,7 @@ extern "C" DynamicStrings_String DynamicStrings_Slice (DynamicStrings_String s,
}
if (TraceOn)
{
d = AssignDebug (d, (const char *) "../../gcc-read-write/gcc/m2/gm2-libs/DynamicStrings.mod", 55, 1397, (const char *) "Slice", 5);
d = AssignDebug (d, (const char *) "../../gcc/m2/gm2-libs/DynamicStrings.mod", 40, 1397, (const char *) "Slice", 5);
}
return d;
/* static analysis guarentees a RETURN statement will be used before here. */
@ -2211,7 +2211,7 @@ extern "C" DynamicStrings_String DynamicStrings_RemoveComment (DynamicStrings_St
}
if (TraceOn)
{
s = AssignDebug (s, (const char *) "../../gcc-read-write/gcc/m2/gm2-libs/DynamicStrings.mod", 55, 1509, (const char *) "RemoveComment", 13);
s = AssignDebug (s, (const char *) "../../gcc/m2/gm2-libs/DynamicStrings.mod", 40, 1509, (const char *) "RemoveComment", 13);
}
return s;
/* static analysis guarentees a RETURN statement will be used before here. */
@ -2236,7 +2236,7 @@ extern "C" DynamicStrings_String DynamicStrings_RemoveWhitePrefix (DynamicString
s = DynamicStrings_Slice (s, (int ) (i), 0);
if (TraceOn)
{
s = AssignDebug (s, (const char *) "../../gcc-read-write/gcc/m2/gm2-libs/DynamicStrings.mod", 55, 1621, (const char *) "RemoveWhitePrefix", 17);
s = AssignDebug (s, (const char *) "../../gcc/m2/gm2-libs/DynamicStrings.mod", 40, 1621, (const char *) "RemoveWhitePrefix", 17);
}
return s;
/* static analysis guarentees a RETURN statement will be used before here. */
@ -2261,7 +2261,7 @@ extern "C" DynamicStrings_String DynamicStrings_RemoveWhitePostfix (DynamicStrin
s = DynamicStrings_Slice (s, 0, i+1);
if (TraceOn)
{
s = AssignDebug (s, (const char *) "../../gcc-read-write/gcc/m2/gm2-libs/DynamicStrings.mod", 55, 1643, (const char *) "RemoveWhitePostfix", 18);
s = AssignDebug (s, (const char *) "../../gcc/m2/gm2-libs/DynamicStrings.mod", 40, 1643, (const char *) "RemoveWhitePostfix", 18);
}
return s;
/* static analysis guarentees a RETURN statement will be used before here. */
@ -2630,7 +2630,7 @@ extern "C" DynamicStrings_String DynamicStrings_PopAllocationExemption (unsigned
{
stop ();
/* writeString ("mismatched number of PopAllocation's compared to PushAllocation's") */
M2RTS_Halt ((const char *) "../../gcc-read-write/gcc/m2/gm2-libs/DynamicStrings.mod", 55, 176, (const char *) "PopAllocationExemption", 22, (const char *) "mismatched number of PopAllocation's compared to PushAllocation's", 65);
M2RTS_Halt ((const char *) "../../gcc/m2/gm2-libs/DynamicStrings.mod", 40, 176, (const char *) "PopAllocationExemption", 22, (const char *) "mismatched number of PopAllocation's compared to PushAllocation's", 65);
}
else
{

20
gcc/m2/mc-boot/GFIO.c
View file

@ -555,7 +555,7 @@ static FIO_File GetNextFreeDescriptor (void)
return f; /* create new slot */
}
}
ReturnException ("../../gcc-read-write/gcc/m2/gm2-libs/FIO.def", 25, 1);
ReturnException ("../../gcc/m2/gm2-libs/FIO.def", 25, 1);
__builtin_unreachable ();
}
@ -726,7 +726,7 @@ static int ReadFromBuffer (FIO_File f, void * a, unsigned int nBytes)
(*p) = static_cast<unsigned char> ((*fd->buffer->contents).array[fd->buffer->position]);
fd->buffer->left -= 1; /* remove consumed bytes */
fd->buffer->position += 1; /* move onwards n bytes */
nBytes = 0; /* reduce the amount for future direct */
nBytes = 0;
/* read */
return 1;
}
@ -821,7 +821,6 @@ static int BufferedRead (FIO_File f, unsigned int nBytes, void * a)
if (f != Error)
{
/* avoid dangling else. */
fd = static_cast<FIO_FileDescriptor> (Indexing_GetIndice (FileInfo, f));
total = 0; /* how many bytes have we read */
if (fd != NULL) /* how many bytes have we read */
@ -891,16 +890,9 @@ static int BufferedRead (FIO_File f, unsigned int nBytes, void * a)
}
return total;
}
else
{
return -1;
}
}
}
else
{
return -1;
}
return -1;
/* static analysis guarentees a RETURN statement will be used before here. */
__builtin_unreachable ();
}
@ -2266,7 +2258,8 @@ extern "C" void * FIO_getFileName (FIO_File f)
return fd->name.address;
}
}
ReturnException ("../../gcc-read-write/gcc/m2/gm2-libs/FIO.def", 25, 1);
return NULL;
/* static analysis guarentees a RETURN statement will be used before here. */
__builtin_unreachable ();
}
@ -2293,7 +2286,8 @@ extern "C" unsigned int FIO_getFileNameLength (FIO_File f)
return fd->name.size;
}
}
ReturnException ("../../gcc-read-write/gcc/m2/gm2-libs/FIO.def", 25, 1);
return 0;
/* static analysis guarentees a RETURN statement will be used before here. */
__builtin_unreachable ();
}

6
gcc/m2/mc-boot/GIndexing.c
View file

@ -222,7 +222,7 @@ extern "C" unsigned int Indexing_InBounds (Indexing_Index i, unsigned int n)
{
return (n >= i->Low) && (n <= i->High);
}
ReturnException ("../../gcc-read-write/gcc/m2/mc/Indexing.def", 20, 1);
ReturnException ("../../gcc/m2/mc/Indexing.def", 20, 1);
__builtin_unreachable ();
}
@ -242,7 +242,7 @@ extern "C" unsigned int Indexing_HighIndice (Indexing_Index i)
{
return i->High;
}
ReturnException ("../../gcc-read-write/gcc/m2/mc/Indexing.def", 20, 1);
ReturnException ("../../gcc/m2/mc/Indexing.def", 20, 1);
__builtin_unreachable ();
}
@ -262,7 +262,7 @@ extern "C" unsigned int Indexing_LowIndice (Indexing_Index i)
{
return i->Low;
}
ReturnException ("../../gcc-read-write/gcc/m2/mc/Indexing.def", 20, 1);
ReturnException ("../../gcc/m2/mc/Indexing.def", 20, 1);
__builtin_unreachable ();
}

450
gcc/m2/mc-boot/GM2Dependent.c
View file

@ -83,6 +83,7 @@ struct M2Dependent_DependencyList_r {
struct M2Dependent__T3_a { M2Dependent_ModuleChain array[M2Dependent_user-M2Dependent_unregistered+1]; };
struct M2Dependent__T2_r {
void *name;
void *libname;
M2Dependent_ArgCVEnvP init;
M2Dependent_ArgCVEnvP fini;
M2Dependent_DependencyList dependency;
@ -92,7 +93,9 @@ struct M2Dependent__T2_r {
static M2Dependent__T3 Modules;
static unsigned int Initialized;
static unsigned int WarningTrace;
static unsigned int ModuleTrace;
static unsigned int HexTrace;
static unsigned int DependencyTrace;
static unsigned int PreTrace;
static unsigned int PostTrace;
@ -103,14 +106,14 @@ static unsigned int ForceTrace;
module constructor in turn.
*/
extern "C" void M2Dependent_ConstructModules (void * applicationmodule, int argc, void * argv, void * envp);
extern "C" void M2Dependent_ConstructModules (void * applicationmodule, void * libname, int argc, void * argv, void * envp);
/*
DeconstructModules - resolve dependencies and then call each
module constructor in turn.
*/
extern "C" void M2Dependent_DeconstructModules (void * applicationmodule, int argc, void * argv, void * envp);
extern "C" void M2Dependent_DeconstructModules (void * applicationmodule, void * libname, int argc, void * argv, void * envp);
/*
RegisterModule - adds module name to the list of outstanding
@ -118,7 +121,7 @@ extern "C" void M2Dependent_DeconstructModules (void * applicationmodule, int ar
explored to determine initialization order.
*/
extern "C" void M2Dependent_RegisterModule (void * name, M2Dependent_ArgCVEnvP init, M2Dependent_ArgCVEnvP fini, PROC dependencies);
extern "C" void M2Dependent_RegisterModule (void * modulename, void * libname, M2Dependent_ArgCVEnvP init, M2Dependent_ArgCVEnvP fini, PROC dependencies);
/*
RequestDependant - used to specify that modulename is dependant upon
@ -126,14 +129,14 @@ extern "C" void M2Dependent_RegisterModule (void * name, M2Dependent_ArgCVEnvP i
if we are not using StaticInitialization.
*/
extern "C" void M2Dependent_RequestDependant (void * modulename, void * dependantmodule);
extern "C" void M2Dependent_RequestDependant (void * modulename, void * libname, void * dependantmodule, void * dependantlibname);
/*
CreateModule - creates a new module entry and returns the
ModuleChain.
*/
static M2Dependent_ModuleChain CreateModule (void * name, M2Dependent_ArgCVEnvP init, M2Dependent_ArgCVEnvP fini, PROC dependencies);
static M2Dependent_ModuleChain CreateModule (void * name, void * libname, M2Dependent_ArgCVEnvP init, M2Dependent_ArgCVEnvP fini, PROC dependencies);
/*
AppendModule - append chain to end of the list.
@ -154,18 +157,30 @@ static void RemoveModule (M2Dependent_ModuleChain *head, M2Dependent_ModuleChain
static unsigned int onChain (M2Dependent_DependencyState state, M2Dependent_ModuleChain mptr);
/*
LookupModuleN - lookup module from the state list. The string is limited
to nchar.
max -
*/
static M2Dependent_ModuleChain LookupModuleN (M2Dependent_DependencyState state, void * name, unsigned int nchar);
static unsigned int max (unsigned int a, unsigned int b);
/*
min -
*/
static unsigned int min (unsigned int a, unsigned int b);
/*
LookupModuleN - lookup module from the state list.
The strings lengths are known.
*/
static M2Dependent_ModuleChain LookupModuleN (M2Dependent_DependencyState state, void * name, unsigned int namelen, void * libname, unsigned int libnamelen);
/*
LookupModule - lookup and return the ModuleChain pointer containing
module name from a particular list.
*/
static M2Dependent_ModuleChain LookupModule (M2Dependent_DependencyState state, void * name);
static M2Dependent_ModuleChain LookupModule (M2Dependent_DependencyState state, void * name, void * libname);
/*
toCString - replace any character sequence
@ -206,6 +221,12 @@ static void traceprintf (unsigned int flag, const char *str_, unsigned int _str_
static void traceprintf2 (unsigned int flag, const char *str_, unsigned int _str_high, void * arg);
/*
traceprintf3 - wrap printf with a boolean flag.
*/
static void traceprintf3 (unsigned int flag, const char *str_, unsigned int _str_high, void * arg1, void * arg2);
/*
moveTo - moves mptr to the new list determined by newstate.
It updates the mptr state appropriately.
@ -217,7 +238,7 @@ static void moveTo (M2Dependent_DependencyState newstate, M2Dependent_ModuleChai
ResolveDependant -
*/
static void ResolveDependant (M2Dependent_ModuleChain mptr, void * currentmodule);
static void ResolveDependant (M2Dependent_ModuleChain mptr, void * currentmodule, void * libname);
/*
PerformRequestDependant - the current modulename has a dependancy upon
@ -226,19 +247,19 @@ static void ResolveDependant (M2Dependent_ModuleChain mptr, void * currentmodule
resolved.
*/
static void PerformRequestDependant (void * modulename, void * dependantmodule);
static void PerformRequestDependant (void * modulename, void * libname, void * dependantmodule, void * dependantlibname);
/*
ResolveDependencies - resolve dependencies for currentmodule.
ResolveDependencies - resolve dependencies for currentmodule, libname.
*/
static void ResolveDependencies (void * currentmodule);
static void ResolveDependencies (void * currentmodule, void * libname);
/*
DisplayModuleInfo - displays all module in the state.
*/
static void DisplayModuleInfo (M2Dependent_DependencyState state, const char *name_, unsigned int _name_high);
static void DisplayModuleInfo (M2Dependent_DependencyState state, const char *desc_, unsigned int _desc_high);
/*
DumpModuleData -
@ -255,6 +276,18 @@ static void DumpModuleData (unsigned int flag);
static void combine (M2Dependent_DependencyState src, M2Dependent_DependencyState dest);
/*
tracemodule -
*/
static void tracemodule (unsigned int flag, void * modname, unsigned int modlen, void * libname, unsigned int liblen);
/*
ForceModule -
*/
static void ForceModule (void * modname, unsigned int modlen, void * libname, unsigned int liblen);
/*
ForceDependencies - if the user has specified a forced order then we override
the dynamic ordering with the preference.
@ -269,6 +302,12 @@ static void ForceDependencies (void);
static void CheckApplication (void);
/*
warning3 - write format arg1 arg2 to stderr.
*/
static void warning3 (const char *format_, unsigned int _format_high, void * arg1, void * arg2);
/*
equal - return TRUE if C string cstr is equal to str.
*/
@ -279,11 +318,12 @@ static unsigned int equal (void * cstr, const char *str_, unsigned int _str_high
SetupDebugFlags - By default assigns ModuleTrace, DependencyTrace,
DumpPostInit to FALSE. It checks the environment
GCC_M2LINK_RTFLAG which can contain
"all,module,pre,post,dep,force". all turns them all on.
"all,module,hex,pre,post,dep,force". all turns them all on.
The flag meanings are as follows and flags the are in
execution order.
module generate trace info as the modules are registered.
hex dump the modules ctor functions address in hex.
pre generate a list of all modules seen prior to having
their dependancies resolved.
dep display a trace as the modules are resolved.
@ -316,18 +356,26 @@ static void CheckInitialized (void);
ModuleChain.
*/
static M2Dependent_ModuleChain CreateModule (void * name, M2Dependent_ArgCVEnvP init, M2Dependent_ArgCVEnvP fini, PROC dependencies)
static M2Dependent_ModuleChain CreateModule (void * name, void * libname, M2Dependent_ArgCVEnvP init, M2Dependent_ArgCVEnvP fini, PROC dependencies)
{
M2Dependent_ModuleChain mptr;
void * p0;
void * p1;
Storage_ALLOCATE ((void **) &mptr, sizeof (M2Dependent__T2));
mptr->name = name;
mptr->libname = libname;
mptr->init = init;
mptr->fini = fini;
mptr->dependency.proc = dependencies;
mptr->dependency.state = M2Dependent_unregistered;
mptr->prev = NULL;
mptr->next = NULL;
if (HexTrace)
{
libc_printf ((const char *) " (init: %p fini: %p", 22, init, fini);
libc_printf ((const char *) " dep: %p)", 10, dependencies);
}
return mptr;
/* static analysis guarentees a RETURN statement will be used before here. */
__builtin_unreachable ();
@ -404,11 +452,49 @@ static unsigned int onChain (M2Dependent_DependencyState state, M2Dependent_Modu
/*
LookupModuleN - lookup module from the state list. The string is limited
to nchar.
max -
*/
static M2Dependent_ModuleChain LookupModuleN (M2Dependent_DependencyState state, void * name, unsigned int nchar)
static unsigned int max (unsigned int a, unsigned int b)
{
if (a > b)
{
return a;
}
else
{
return b;
}
/* static analysis guarentees a RETURN statement will be used before here. */
__builtin_unreachable ();
}
/*
min -
*/
static unsigned int min (unsigned int a, unsigned int b)
{
if (a < b)
{
return a;
}
else
{
return b;
}
/* static analysis guarentees a RETURN statement will be used before here. */
__builtin_unreachable ();
}
/*
LookupModuleN - lookup module from the state list.
The strings lengths are known.
*/
static M2Dependent_ModuleChain LookupModuleN (M2Dependent_DependencyState state, void * name, unsigned int namelen, void * libname, unsigned int libnamelen)
{
M2Dependent_ModuleChain ptr;
@ -416,7 +502,7 @@ static M2Dependent_ModuleChain LookupModuleN (M2Dependent_DependencyState state,
{
ptr = Modules.array[state-M2Dependent_unregistered];
do {
if ((strncmp (reinterpret_cast<M2LINK_PtrToChar> (ptr->name), reinterpret_cast<M2LINK_PtrToChar> (name), nchar)) == 0)
if (((strncmp (reinterpret_cast<M2LINK_PtrToChar> (ptr->name), reinterpret_cast<M2LINK_PtrToChar> (name), max (namelen, static_cast<unsigned int> (strlen_ (reinterpret_cast<M2LINK_PtrToChar> (ptr->name)))))) == 0) && ((strncmp (reinterpret_cast<M2LINK_PtrToChar> (ptr->libname), reinterpret_cast<M2LINK_PtrToChar> (libname), max (libnamelen, static_cast<unsigned int> (strlen_ (reinterpret_cast<M2LINK_PtrToChar> (ptr->libname)))))) == 0))
{
return ptr;
}
@ -434,9 +520,9 @@ static M2Dependent_ModuleChain LookupModuleN (M2Dependent_DependencyState state,
module name from a particular list.
*/
static M2Dependent_ModuleChain LookupModule (M2Dependent_DependencyState state, void * name)
static M2Dependent_ModuleChain LookupModule (M2Dependent_DependencyState state, void * name, void * libname)
{
return LookupModuleN (state, name, static_cast<unsigned int> (strlen_ (reinterpret_cast<M2LINK_PtrToChar> (name))));
return LookupModuleN (state, name, static_cast<unsigned int> (strlen_ (reinterpret_cast<M2LINK_PtrToChar> (name))), libname, static_cast<unsigned int> (strlen_ (reinterpret_cast<M2LINK_PtrToChar> (libname))));
/* static analysis guarentees a RETURN statement will be used before here. */
__builtin_unreachable ();
}
@ -515,9 +601,13 @@ static int strcmp (M2LINK_PtrToChar a, M2LINK_PtrToChar b)
static int strncmp (M2LINK_PtrToChar a, M2LINK_PtrToChar b, unsigned int n)
{
if (((a != NULL) && (b != NULL)) && (n > 0))
if (n == 0)
{
/* avoid gcc warning by using compound statement even if not strictly necessary. */
return 0;
}
else if ((a != NULL) && (b != NULL))
{
/* avoid dangling else. */
if (a == b)
{
return 0;
@ -594,6 +684,7 @@ static void traceprintf (unsigned int flag, const char *str_, unsigned int _str_
static void traceprintf2 (unsigned int flag, const char *str_, unsigned int _str_high, void * arg)
{
char ch;
char str[_str_high+1];
/* make a local copy of each unbounded array. */
@ -602,11 +693,46 @@ static void traceprintf2 (unsigned int flag, const char *str_, unsigned int _str
if (flag)
{
toCString ((char *) str, _str_high);
if (arg == NULL)
{
ch = (char) 0;
arg = &ch;
}
libc_printf ((const char *) str, _str_high, arg);
}
}
/*
traceprintf3 - wrap printf with a boolean flag.
*/
static void traceprintf3 (unsigned int flag, const char *str_, unsigned int _str_high, void * arg1, void * arg2)
{
char ch;
char str[_str_high+1];
/* make a local copy of each unbounded array. */
memcpy (str, str_, _str_high+1);
if (flag)
{
toCString ((char *) str, _str_high);
if (arg1 == NULL)
{
ch = (char) 0;
arg1 = &ch;
}
if (arg2 == NULL)
{
ch = (char) 0;
arg2 = &ch;
}
libc_printf ((const char *) str, _str_high, arg1, arg2);
}
}
/*
moveTo - moves mptr to the new list determined by newstate.
It updates the mptr state appropriately.
@ -627,11 +753,11 @@ static void moveTo (M2Dependent_DependencyState newstate, M2Dependent_ModuleChai
ResolveDependant -
*/
static void ResolveDependant (M2Dependent_ModuleChain mptr, void * currentmodule)
static void ResolveDependant (M2Dependent_ModuleChain mptr, void * currentmodule, void * libname)
{
if (mptr == NULL)
{
traceprintf (DependencyTrace, (const char *) " module has not been registered via a global constructor\\n", 60);
traceprintf3 (DependencyTrace, (const char *) " module %s [%s] has not been registered via a global constructor\\n", 68, currentmodule, libname);
}
else
{
@ -642,9 +768,9 @@ static void ResolveDependant (M2Dependent_ModuleChain mptr, void * currentmodule
else
{
moveTo (M2Dependent_started, mptr);
traceprintf2 (DependencyTrace, (const char *) " starting: %s\\n", 17, currentmodule);
traceprintf3 (DependencyTrace, (const char *) " starting: %s [%s]\\n", 22, currentmodule, libname);
(*mptr->dependency.proc.proc) (); /* Invoke and process the dependency graph. */
traceprintf2 (DependencyTrace, (const char *) " finished: %s\\n", 17, currentmodule); /* Invoke and process the dependency graph. */
traceprintf3 (DependencyTrace, (const char *) " finished: %s [%s]\\n", 22, currentmodule, libname); /* Invoke and process the dependency graph. */
moveTo (M2Dependent_ordered, mptr);
}
}
@ -658,73 +784,73 @@ static void ResolveDependant (M2Dependent_ModuleChain mptr, void * currentmodule
resolved.
*/
static void PerformRequestDependant (void * modulename, void * dependantmodule)
static void PerformRequestDependant (void * modulename, void * libname, void * dependantmodule, void * dependantlibname)
{
M2Dependent_ModuleChain mptr;
traceprintf2 (DependencyTrace, (const char *) " module %s", 11, modulename);
traceprintf3 (DependencyTrace, (const char *) " module %s [%s]", 16, modulename, libname);
if (dependantmodule == NULL)
{
/* avoid dangling else. */
traceprintf2 (DependencyTrace, (const char *) " has finished its import graph\\n", 32, modulename);
mptr = LookupModule (M2Dependent_unordered, modulename);
traceprintf (DependencyTrace, (const char *) " has finished its import graph\\n", 32);
mptr = LookupModule (M2Dependent_unordered, modulename, libname);
if (mptr != NULL)
{
traceprintf2 (DependencyTrace, (const char *) " module %s is now ordered\\n", 28, modulename);
traceprintf3 (DependencyTrace, (const char *) " module %s [%s] is now ordered\\n", 33, modulename, libname);
moveTo (M2Dependent_ordered, mptr);
}
}
else
{
traceprintf2 (DependencyTrace, (const char *) " imports from %s\\n", 18, dependantmodule);
mptr = LookupModule (M2Dependent_ordered, dependantmodule);
traceprintf3 (DependencyTrace, (const char *) " imports from %s [%s]\\n", 23, dependantmodule, dependantlibname);
mptr = LookupModule (M2Dependent_ordered, dependantmodule, dependantlibname);
if (mptr == NULL)
{
traceprintf2 (DependencyTrace, (const char *) " module %s is not ordered\\n", 28, dependantmodule);
mptr = LookupModule (M2Dependent_unordered, dependantmodule);
traceprintf3 (DependencyTrace, (const char *) " module %s [%s] is not ordered\\n", 33, dependantmodule, dependantlibname);
mptr = LookupModule (M2Dependent_unordered, dependantmodule, dependantlibname);
if (mptr == NULL)
{
traceprintf2 (DependencyTrace, (const char *) " module %s is not unordered\\n", 30, dependantmodule);
mptr = LookupModule (M2Dependent_started, dependantmodule);
traceprintf3 (DependencyTrace, (const char *) " module %s [%s] is not unordered\\n", 35, dependantmodule, dependantlibname);
mptr = LookupModule (M2Dependent_started, dependantmodule, dependantlibname);
if (mptr == NULL)
{
traceprintf2 (DependencyTrace, (const char *) " module %s has not started\\n", 29, dependantmodule);
traceprintf2 (DependencyTrace, (const char *) " module %s attempting to import from", 37, modulename);
traceprintf2 (DependencyTrace, (const char *) " %s which has not registered itself via a constructor\\n", 55, dependantmodule);
traceprintf3 (DependencyTrace, (const char *) " module %s [%s] has not started\\n", 34, dependantmodule, dependantlibname);
traceprintf3 (DependencyTrace, (const char *) " module %s [%s] attempting to import from", 42, modulename, libname);
traceprintf3 (DependencyTrace, (const char *) " %s [%s] which has not registered itself via a constructor\\n", 60, dependantmodule, dependantlibname);
}
else
{
traceprintf2 (DependencyTrace, (const char *) " module %s has registered itself and has started\\n", 51, dependantmodule);
traceprintf3 (DependencyTrace, (const char *) " module %s [%s] has registered itself and has started\\n", 56, dependantmodule, dependantlibname);
}
}
else
{
traceprintf2 (DependencyTrace, (const char *) " module %s resolving\\n", 23, dependantmodule);
ResolveDependant (mptr, dependantmodule);
traceprintf3 (DependencyTrace, (const char *) " module %s [%s] resolving\\n", 28, dependantmodule, dependantlibname);
ResolveDependant (mptr, dependantmodule, dependantlibname);
}
}
else
{
traceprintf2 (DependencyTrace, (const char *) " module %s ", 12, modulename);
traceprintf2 (DependencyTrace, (const char *) " dependant %s is ordered\\n", 26, dependantmodule);
traceprintf3 (DependencyTrace, (const char *) " module %s [%s]", 16, modulename, libname);
traceprintf3 (DependencyTrace, (const char *) " dependant %s [%s] is ordered\\n", 31, dependantmodule, dependantlibname);
}
}
}
/*
ResolveDependencies - resolve dependencies for currentmodule.
ResolveDependencies - resolve dependencies for currentmodule, libname.
*/
static void ResolveDependencies (void * currentmodule)
static void ResolveDependencies (void * currentmodule, void * libname)
{
M2Dependent_ModuleChain mptr;
mptr = LookupModule (M2Dependent_unordered, currentmodule);
mptr = LookupModule (M2Dependent_unordered, currentmodule, libname);
while (mptr != NULL)
{
traceprintf2 (DependencyTrace, (const char *) " attempting to resolve the dependants for %s\\n", 48, currentmodule);
ResolveDependant (mptr, currentmodule);
traceprintf3 (DependencyTrace, (const char *) " attempting to resolve the dependants for %s [%s]\\n", 53, currentmodule, libname);
ResolveDependant (mptr, currentmodule, libname);
mptr = Modules.array[M2Dependent_unordered-M2Dependent_unregistered];
}
}
@ -734,22 +860,29 @@ static void ResolveDependencies (void * currentmodule)
DisplayModuleInfo - displays all module in the state.
*/
static void DisplayModuleInfo (M2Dependent_DependencyState state, const char *name_, unsigned int _name_high)
static void DisplayModuleInfo (M2Dependent_DependencyState state, const char *desc_, unsigned int _desc_high)
{
M2Dependent_ModuleChain mptr;
unsigned int count;
char name[_name_high+1];
char desc[_desc_high+1];
/* make a local copy of each unbounded array. */
memcpy (name, name_, _name_high+1);
memcpy (desc, desc_, _desc_high+1);
if (Modules.array[state-M2Dependent_unregistered] != NULL)
{
libc_printf ((const char *) "%s modules\\n", 12, &name);
libc_printf ((const char *) "%s modules\\n", 12, &desc);
mptr = Modules.array[state-M2Dependent_unregistered];
count = 0;
do {
libc_printf ((const char *) " %d %s", 8, count, mptr->name);
if (mptr->name == NULL)
{
libc_printf ((const char *) " %d %s []", 11, count, mptr->name);
}
else
{
libc_printf ((const char *) " %d %s [%s]", 13, count, mptr->name, mptr->libname);
}
count += 1;
if (mptr->dependency.appl)
{
@ -808,6 +941,52 @@ static void combine (M2Dependent_DependencyState src, M2Dependent_DependencyStat
}
/*
tracemodule -
*/
static void tracemodule (unsigned int flag, void * modname, unsigned int modlen, void * libname, unsigned int liblen)
{
typedef struct tracemodule__T4_a tracemodule__T4;
struct tracemodule__T4_a { char array[100+1]; };
tracemodule__T4 buffer;
unsigned int len;
if (flag)
{
len = min (modlen, sizeof (buffer)-1);
libc_strncpy (&buffer, modname, len);
buffer.array[len] = (char) 0;
libc_printf ((const char *) "%s ", 3, &buffer);
len = min (liblen, sizeof (buffer)-1);
libc_strncpy (&buffer, libname, len);
buffer.array[len] = (char) 0;
libc_printf ((const char *) " [%s]", 5, &buffer);
}
}
/*
ForceModule -
*/
static void ForceModule (void * modname, unsigned int modlen, void * libname, unsigned int liblen)
{
M2Dependent_ModuleChain mptr;
traceprintf (ForceTrace, (const char *) "forcing module: ", 16);
tracemodule (ForceTrace, modname, modlen, libname, liblen);
traceprintf (ForceTrace, (const char *) "\\n", 2);
mptr = LookupModuleN (M2Dependent_ordered, modname, modlen, libname, liblen);
if (mptr != NULL)
{
mptr->dependency.forced = TRUE;
moveTo (M2Dependent_user, mptr);
}
}
/*
ForceDependencies - if the user has specified a forced order then we override
the dynamic ordering with the preference.
@ -815,46 +994,58 @@ static void combine (M2Dependent_DependencyState src, M2Dependent_DependencyStat
static void ForceDependencies (void)
{
M2Dependent_ModuleChain mptr;
M2Dependent_ModuleChain userChain;
unsigned int count;
unsigned int len;
unsigned int modlen;
unsigned int liblen;
M2LINK_PtrToChar modname;
M2LINK_PtrToChar libname;
M2LINK_PtrToChar pc;
M2LINK_PtrToChar start;
if (M2LINK_ForcedModuleInitOrder != NULL)
{
userChain = NULL;
traceprintf2 (ForceTrace, (const char *) "user forcing order: %s\\n", 24, reinterpret_cast<void *> (M2LINK_ForcedModuleInitOrder));
pc = M2LINK_ForcedModuleInitOrder;
start = pc;
count = 0;
len = 0;
modname = NULL;
modlen = 0;
libname = NULL;
liblen = 0;
while ((*pc) != ASCII_nul)
{
if ((*pc) == ',')
switch ((*pc))
{
mptr = LookupModuleN (M2Dependent_ordered, reinterpret_cast<void *> (start), count);
if (mptr != NULL)
{
mptr->dependency.forced = TRUE;
moveTo (M2Dependent_user, mptr);
}
pc += 1;
start = pc;
count = 0;
}
else
{
pc += 1;
count += 1;
case ':':
libname = start;
liblen = len;
len = 0;
pc += 1;
start = pc;
break;
case ',':
modname = start;
modlen = len;
ForceModule (reinterpret_cast<void *> (modname), modlen, reinterpret_cast<void *> (libname), liblen);
libname = NULL;
liblen = 0;
modlen = 0;
len = 0;
pc += 1;
start = pc;
break;
default:
pc += 1;
len += 1;
break;
}
}
if (start != pc)
{
mptr = LookupModuleN (M2Dependent_ordered, reinterpret_cast<void *> (start), count);
if (mptr != NULL)
{
mptr->dependency.forced = TRUE;
moveTo (M2Dependent_user, mptr);
}
ForceModule (reinterpret_cast<void *> (start), len, reinterpret_cast<void *> (libname), liblen);
}
combine (M2Dependent_user, M2Dependent_ordered);
}
@ -887,12 +1078,39 @@ static void CheckApplication (void)
} while (! ((appl != NULL) || (mptr == Modules.array[M2Dependent_ordered-M2Dependent_unregistered])));
if (appl != NULL)
{
Modules.array[M2Dependent_ordered-M2Dependent_unregistered] = appl->next;
RemoveModule (&Modules.array[M2Dependent_ordered-M2Dependent_unregistered], appl);
AppendModule (&Modules.array[M2Dependent_ordered-M2Dependent_unregistered], appl);
}
}
}
/*
warning3 - write format arg1 arg2 to stderr.
*/
static void warning3 (const char *format_, unsigned int _format_high, void * arg1, void * arg2)
{
typedef struct warning3__T5_a warning3__T5;
struct warning3__T5_a { char array[4096+1]; };
warning3__T5 buffer;
int len;
char format[_format_high+1];
/* make a local copy of each unbounded array. */
memcpy (format, format_, _format_high+1);
if (WarningTrace)
{
len = libc_snprintf (&buffer, static_cast<size_t> (sizeof (buffer)), (const char *) "warning: ", 9);
libc_write (2, &buffer, static_cast<size_t> (len));
len = libc_snprintf (&buffer, static_cast<size_t> (sizeof (buffer)), (const char *) format, _format_high, arg1, arg2);
libc_write (2, &buffer, static_cast<size_t> (len));
}
}
/*
equal - return TRUE if C string cstr is equal to str.
*/
@ -914,11 +1132,12 @@ static unsigned int equal (void * cstr, const char *str_, unsigned int _str_high
SetupDebugFlags - By default assigns ModuleTrace, DependencyTrace,
DumpPostInit to FALSE. It checks the environment
GCC_M2LINK_RTFLAG which can contain
"all,module,pre,post,dep,force". all turns them all on.
"all,module,hex,pre,post,dep,force". all turns them all on.
The flag meanings are as follows and flags the are in
execution order.
module generate trace info as the modules are registered.
hex dump the modules ctor functions address in hex.
pre generate a list of all modules seen prior to having
their dependancies resolved.
dep display a trace as the modules are resolved.
@ -939,6 +1158,8 @@ static void SetupDebugFlags (void)
PostTrace = FALSE;
PreTrace = FALSE;
ForceTrace = FALSE;
HexTrace = FALSE;
WarningTrace = FALSE;
pc = static_cast<SetupDebugFlags__T1> (libc_getenv (const_cast<void*> (reinterpret_cast<const void*>("GCC_M2LINK_RTFLAG"))));
while ((pc != NULL) && ((*pc) != ASCII_nul))
{
@ -949,6 +1170,8 @@ static void SetupDebugFlags (void)
PreTrace = TRUE;
PostTrace = TRUE;
ForceTrace = TRUE;
HexTrace = TRUE;
WarningTrace = TRUE;
pc += 3;
}
else if (equal (reinterpret_cast<void *> (pc), (const char *) "module", 6))
@ -957,6 +1180,18 @@ static void SetupDebugFlags (void)
ModuleTrace = TRUE;
pc += 6;
}
else if (equal (reinterpret_cast<void *> (pc), (const char *) "warning", 7))
{
/* avoid dangling else. */
WarningTrace = TRUE;
pc += 7;
}
else if (equal (reinterpret_cast<void *> (pc), (const char *) "hex", 3))
{
/* avoid dangling else. */
HexTrace = TRUE;
pc += 3;
}
else if (equal (reinterpret_cast<void *> (pc), (const char *) "dep", 3))
{
/* avoid dangling else. */
@ -1028,21 +1263,21 @@ static void CheckInitialized (void)
module constructor in turn.
*/
extern "C" void M2Dependent_ConstructModules (void * applicationmodule, int argc, void * argv, void * envp)
extern "C" void M2Dependent_ConstructModules (void * applicationmodule, void * libname, int argc, void * argv, void * envp)
{
M2Dependent_ModuleChain mptr;
M2Dependent_ArgCVEnvP nulp;
CheckInitialized ();
traceprintf2 (ModuleTrace, (const char *) "application module: %s\\n", 24, applicationmodule);
mptr = LookupModule (M2Dependent_unordered, applicationmodule);
traceprintf3 (ModuleTrace, (const char *) "application module: %s [%s]\\n", 29, applicationmodule, libname);
mptr = LookupModule (M2Dependent_unordered, applicationmodule, libname);
if (mptr != NULL)
{
mptr->dependency.appl = TRUE;
}
traceprintf (PreTrace, (const char *) "Pre resolving dependents\\n", 26);
DumpModuleData (PreTrace);
ResolveDependencies (applicationmodule);
ResolveDependencies (applicationmodule, libname);
traceprintf (PreTrace, (const char *) "Post resolving dependents\\n", 27);
DumpModuleData (PostTrace);
ForceDependencies ();
@ -1053,7 +1288,7 @@ extern "C" void M2Dependent_ConstructModules (void * applicationmodule, int argc
DumpModuleData (ForceTrace);
if (Modules.array[M2Dependent_ordered-M2Dependent_unregistered] == NULL)
{
traceprintf2 (ModuleTrace, (const char *) " module: %s has not registered itself using a global constructor\\n", 67, applicationmodule);
traceprintf3 (ModuleTrace, (const char *) " module: %s [%s] has not registered itself using a global constructor\\n", 72, applicationmodule, libname);
traceprintf2 (ModuleTrace, (const char *) " hint try compile and linking using: gm2 %s.mod\\n", 50, applicationmodule);
traceprintf2 (ModuleTrace, (const char *) " or try using: gm2 -fscaffold-static %s.mod\\n", 46, applicationmodule);
}
@ -1063,15 +1298,15 @@ extern "C" void M2Dependent_ConstructModules (void * applicationmodule, int argc
do {
if (mptr->dependency.forc)
{
traceprintf2 (ModuleTrace, (const char *) "initializing module: %s for C\\n", 31, mptr->name);
traceprintf3 (ModuleTrace, (const char *) "initializing module: %s [%s] for C\\n", 36, mptr->name, mptr->libname);
}
else
{
traceprintf2 (ModuleTrace, (const char *) "initializing module: %s\\n", 25, mptr->name);
traceprintf3 (ModuleTrace, (const char *) "initializing module: %s [%s]\\n", 30, mptr->name, mptr->libname);
}
if (mptr->dependency.appl)
{
traceprintf2 (ModuleTrace, (const char *) "application module: %s\\n", 24, mptr->name);
traceprintf3 (ModuleTrace, (const char *) "application module: %s [%s]\\n", 29, mptr->name, mptr->libname);
traceprintf (ModuleTrace, (const char *) " calling M2RTS_ExecuteInitialProcedures\\n", 42);
M2RTS_ExecuteInitialProcedures ();
traceprintf (ModuleTrace, (const char *) " calling application module\\n", 30);
@ -1088,11 +1323,11 @@ extern "C" void M2Dependent_ConstructModules (void * applicationmodule, int argc
module constructor in turn.
*/
extern "C" void M2Dependent_DeconstructModules (void * applicationmodule, int argc, void * argv, void * envp)
extern "C" void M2Dependent_DeconstructModules (void * applicationmodule, void * libname, int argc, void * argv, void * envp)
{
M2Dependent_ModuleChain mptr;
traceprintf2 (ModuleTrace, (const char *) "application module finishing: %s\\n", 34, applicationmodule);
traceprintf3 (ModuleTrace, (const char *) "application module finishing: %s [%s]\\n", 39, applicationmodule, libname);
if (Modules.array[M2Dependent_ordered-M2Dependent_unregistered] == NULL)
{
traceprintf (ModuleTrace, (const char *) " no ordered modules found during finishing\\n", 45);
@ -1106,11 +1341,11 @@ extern "C" void M2Dependent_DeconstructModules (void * applicationmodule, int ar
do {
if (mptr->dependency.forc)
{
traceprintf2 (ModuleTrace, (const char *) "finalizing module: %s for C\\n", 29, mptr->name);
traceprintf3 (ModuleTrace, (const char *) "finalizing module: %s [%s] for C\\n", 34, mptr->name, mptr->libname);
}
else
{
traceprintf2 (ModuleTrace, (const char *) "finalizing module: %s\\n", 23, mptr->name);
traceprintf3 (ModuleTrace, (const char *) "finalizing module: %s [%s]\\n", 28, mptr->name, mptr->libname);
}
(*mptr->fini.proc) (argc, argv, envp);
mptr = mptr->prev;
@ -1125,13 +1360,24 @@ extern "C" void M2Dependent_DeconstructModules (void * applicationmodule, int ar
explored to determine initialization order.
*/
extern "C" void M2Dependent_RegisterModule (void * name, M2Dependent_ArgCVEnvP init, M2Dependent_ArgCVEnvP fini, PROC dependencies)
extern "C" void M2Dependent_RegisterModule (void * modulename, void * libname, M2Dependent_ArgCVEnvP init, M2Dependent_ArgCVEnvP fini, PROC dependencies)
{
M2Dependent_ModuleChain mptr;
CheckInitialized ();
if (! M2LINK_StaticInitialization)
{
traceprintf2 (ModuleTrace, (const char *) "module: %s registering\\n", 24, name);
moveTo (M2Dependent_unordered, CreateModule (name, init, fini, dependencies));
mptr = LookupModule (M2Dependent_unordered, modulename, libname);
if (mptr == NULL)
{
traceprintf3 (ModuleTrace, (const char *) "module: %s [%s] registering", 27, modulename, libname);
moveTo (M2Dependent_unordered, CreateModule (modulename, libname, init, fini, dependencies));
traceprintf (ModuleTrace, (const char *) "\\n", 2);
}
else
{
warning3 ((const char *) "module: %s [%s] (ignoring duplicate registration)\\n", 51, modulename, libname);
}
}
}
@ -1142,12 +1388,12 @@ extern "C" void M2Dependent_RegisterModule (void * name, M2Dependent_ArgCVEnvP i
if we are not using StaticInitialization.
*/
extern "C" void M2Dependent_RequestDependant (void * modulename, void * dependantmodule)
extern "C" void M2Dependent_RequestDependant (void * modulename, void * libname, void * dependantmodule, void * dependantlibname)
{
CheckInitialized ();
if (! M2LINK_StaticInitialization)
{
PerformRequestDependant (modulename, dependantmodule);
PerformRequestDependant (modulename, libname, dependantmodule, dependantlibname);
}
}

13
gcc/m2/mc-boot/GM2Dependent.h
View file

@ -53,8 +53,8 @@ typedef struct M2Dependent_ArgCVEnvP_p M2Dependent_ArgCVEnvP;
typedef void (*M2Dependent_ArgCVEnvP_t) (int, void *, void *);
struct M2Dependent_ArgCVEnvP_p { M2Dependent_ArgCVEnvP_t proc; };
EXTERN void M2Dependent_ConstructModules (void * applicationmodule, int argc, void * argv, void * envp);
EXTERN void M2Dependent_DeconstructModules (void * applicationmodule, int argc, void * argv, void * envp);
EXTERN void M2Dependent_ConstructModules (void * applicationmodule, void * libname, int argc, void * argv, void * envp);
EXTERN void M2Dependent_DeconstructModules (void * applicationmodule, void * libname, int argc, void * argv, void * envp);
/*
RegisterModule - adds module name to the list of outstanding
@ -62,14 +62,15 @@ EXTERN void M2Dependent_DeconstructModules (void * applicationmodule, int argc,
explored to determine initialization order.
*/
EXTERN void M2Dependent_RegisterModule (void * name, M2Dependent_ArgCVEnvP init, M2Dependent_ArgCVEnvP fini, PROC dependencies);
EXTERN void M2Dependent_RegisterModule (void * modulename, void * libname, M2Dependent_ArgCVEnvP init, M2Dependent_ArgCVEnvP fini, PROC dependencies);
/*
RequestDependant - used to specify that modulename is dependant upon
module dependantmodule.
RequestDependant - used to specify that modulename:libname
is dependant upon
module dependantmodule:dependantlibname
*/
EXTERN void M2Dependent_RequestDependant (void * modulename, void * dependantmodule);
EXTERN void M2Dependent_RequestDependant (void * modulename, void * libname, void * dependantmodule, void * dependantlibname);
# ifdef __cplusplus
}
# endif

4
gcc/m2/mc-boot/GM2EXCEPTION.c
View file

@ -57,13 +57,13 @@ extern "C" M2EXCEPTION_M2Exceptions M2EXCEPTION_M2Exception (void)
n = RTExceptions_GetNumber (e);
if (n == (UINT_MAX))
{
RTExceptions_Raise ( ((unsigned int) (M2EXCEPTION_exException)), const_cast<void*> (reinterpret_cast<const void*>("../../gcc-read-write/gcc/m2/gm2-libs/M2EXCEPTION.mod")), 47, 6, const_cast<void*> (reinterpret_cast<const void*>("M2Exception")), const_cast<void*> (reinterpret_cast<const void*>("current coroutine is not in the exceptional execution state")));
RTExceptions_Raise ( ((unsigned int) (M2EXCEPTION_exException)), const_cast<void*> (reinterpret_cast<const void*>("../../gcc/m2/gm2-libs/M2EXCEPTION.mod")), 47, 6, const_cast<void*> (reinterpret_cast<const void*>("M2Exception")), const_cast<void*> (reinterpret_cast<const void*>("current coroutine is not in the exceptional execution state")));
}
else
{
return (M2EXCEPTION_M2Exceptions) (n);
}
ReturnException ("../../gcc-read-write/gcc/m2/gm2-libs/M2EXCEPTION.def", 25, 1);
ReturnException ("../../gcc/m2/gm2-libs/M2EXCEPTION.def", 25, 1);
__builtin_unreachable ();
}

24
gcc/m2/mc-boot/GM2RTS.c
View file

@ -96,14 +96,14 @@ static unsigned int Initialized;
module constructor in turn.
*/
extern "C" void M2RTS_ConstructModules (void * applicationmodule, int argc, void * argv, void * envp);
extern "C" void M2RTS_ConstructModules (void * applicationmodule, void * libname, int argc, void * argv, void * envp);
/*
DeconstructModules - resolve dependencies and then call each
module constructor in turn.
*/
extern "C" void M2RTS_DeconstructModules (void * applicationmodule, int argc, void * argv, void * envp);
extern "C" void M2RTS_DeconstructModules (void * applicationmodule, void * libname, int argc, void * argv, void * envp);
/*
RegisterModule - adds module name to the list of outstanding
@ -111,14 +111,14 @@ extern "C" void M2RTS_DeconstructModules (void * applicationmodule, int argc, vo
explored to determine initialization order.
*/
extern "C" void M2RTS_RegisterModule (void * name, M2RTS_ArgCVEnvP init, M2RTS_ArgCVEnvP fini, PROC dependencies);
extern "C" void M2RTS_RegisterModule (void * name, void * libname, M2RTS_ArgCVEnvP init, M2RTS_ArgCVEnvP fini, PROC dependencies);
/*
RequestDependant - used to specify that modulename is dependant upon
module dependantmodule.
*/
extern "C" void M2RTS_RequestDependant (void * modulename, void * dependantmodule);
extern "C" void M2RTS_RequestDependant (void * modulename, void * libname, void * dependantmodule, void * dependantlibname);
/*
InstallTerminationProcedure - installs a procedure, p, which will
@ -434,9 +434,9 @@ static void CheckInitialized (void)
module constructor in turn.
*/
extern "C" void M2RTS_ConstructModules (void * applicationmodule, int argc, void * argv, void * envp)
extern "C" void M2RTS_ConstructModules (void * applicationmodule, void * libname, int argc, void * argv, void * envp)
{
M2Dependent_ConstructModules (applicationmodule, argc, argv, envp);
M2Dependent_ConstructModules (applicationmodule, libname, argc, argv, envp);
}
@ -445,9 +445,9 @@ extern "C" void M2RTS_ConstructModules (void * applicationmodule, int argc, void
module constructor in turn.
*/
extern "C" void M2RTS_DeconstructModules (void * applicationmodule, int argc, void * argv, void * envp)
extern "C" void M2RTS_DeconstructModules (void * applicationmodule, void * libname, int argc, void * argv, void * envp)
{
M2Dependent_DeconstructModules (applicationmodule, argc, argv, envp);
M2Dependent_DeconstructModules (applicationmodule, libname, argc, argv, envp);
}
@ -457,9 +457,9 @@ extern "C" void M2RTS_DeconstructModules (void * applicationmodule, int argc, vo
explored to determine initialization order.
*/
extern "C" void M2RTS_RegisterModule (void * name, M2RTS_ArgCVEnvP init, M2RTS_ArgCVEnvP fini, PROC dependencies)
extern "C" void M2RTS_RegisterModule (void * name, void * libname, M2RTS_ArgCVEnvP init, M2RTS_ArgCVEnvP fini, PROC dependencies)
{
M2Dependent_RegisterModule (name, (M2Dependent_ArgCVEnvP) {(M2Dependent_ArgCVEnvP_t) init.proc}, (M2Dependent_ArgCVEnvP) {(M2Dependent_ArgCVEnvP_t) fini.proc}, dependencies);
M2Dependent_RegisterModule (name, libname, (M2Dependent_ArgCVEnvP) {(M2Dependent_ArgCVEnvP_t) init.proc}, (M2Dependent_ArgCVEnvP) {(M2Dependent_ArgCVEnvP_t) fini.proc}, dependencies);
}
@ -468,9 +468,9 @@ extern "C" void M2RTS_RegisterModule (void * name, M2RTS_ArgCVEnvP init, M2RTS_A
module dependantmodule.
*/
extern "C" void M2RTS_RequestDependant (void * modulename, void * dependantmodule)
extern "C" void M2RTS_RequestDependant (void * modulename, void * libname, void * dependantmodule, void * dependantlibname)
{
M2Dependent_RequestDependant (modulename, dependantmodule);
M2Dependent_RequestDependant (modulename, libname, dependantmodule, dependantlibname);
}

8
gcc/m2/mc-boot/GM2RTS.h
View file

@ -53,8 +53,8 @@ typedef struct M2RTS_ArgCVEnvP_p M2RTS_ArgCVEnvP;
typedef void (*M2RTS_ArgCVEnvP_t) (int, void *, void *);
struct M2RTS_ArgCVEnvP_p { M2RTS_ArgCVEnvP_t proc; };
EXTERN void M2RTS_ConstructModules (void * applicationmodule, int argc, void * argv, void * envp);
EXTERN void M2RTS_DeconstructModules (void * applicationmodule, int argc, void * argv, void * envp);
EXTERN void M2RTS_ConstructModules (void * applicationmodule, void * libname, int argc, void * argv, void * envp);
EXTERN void M2RTS_DeconstructModules (void * applicationmodule, void * libname, int argc, void * argv, void * envp);
/*
RegisterModule - adds module name to the list of outstanding
@ -62,14 +62,14 @@ EXTERN void M2RTS_DeconstructModules (void * applicationmodule, int argc, void *
explored to determine initialization order.
*/
EXTERN void M2RTS_RegisterModule (void * name, M2RTS_ArgCVEnvP init, M2RTS_ArgCVEnvP fini, PROC dependencies);
EXTERN void M2RTS_RegisterModule (void * name, void * libname, M2RTS_ArgCVEnvP init, M2RTS_ArgCVEnvP fini, PROC dependencies);
/*
RequestDependant - used to specify that modulename is dependant upon
module dependantmodule.
*/
EXTERN void M2RTS_RequestDependant (void * modulename, void * dependantmodule);
EXTERN void M2RTS_RequestDependant (void * modulename, void * libname, void * dependantmodule, void * dependantlibname);
/*
InstallTerminationProcedure - installs a procedure, p, which will

6
gcc/m2/mc-boot/GPushBackInput.c
View file

@ -274,7 +274,7 @@ extern "C" char PushBackInput_PutCh (char ch)
}
else
{
Debug_Halt ((const char *) "max push back stack exceeded, increase MaxPushBackStack", 55, 150, (const char *) "../../gcc-read-write/gcc/m2/gm2-libs/PushBackInput.mod", 54);
Debug_Halt ((const char *) "max push back stack exceeded, increase MaxPushBackStack", 55, 150, (const char *) "../../gcc/m2/gm2-libs/PushBackInput.mod", 39);
}
return ch;
/* static analysis guarentees a RETURN statement will be used before here. */
@ -300,7 +300,7 @@ extern "C" void PushBackInput_PutString (const char *a_, unsigned int _a_high)
l -= 1;
if ((PushBackInput_PutCh (a[l])) != a[l])
{
Debug_Halt ((const char *) "assert failed", 13, 132, (const char *) "../../gcc-read-write/gcc/m2/gm2-libs/PushBackInput.mod", 54);
Debug_Halt ((const char *) "assert failed", 13, 132, (const char *) "../../gcc/m2/gm2-libs/PushBackInput.mod", 39);
}
}
}
@ -321,7 +321,7 @@ extern "C" void PushBackInput_PutStr (DynamicStrings_String s)
i -= 1;
if ((PushBackInput_PutCh (DynamicStrings_char (s, static_cast<int> (i)))) != (DynamicStrings_char (s, static_cast<int> (i))))
{
Debug_Halt ((const char *) "assert failed", 13, 113, (const char *) "../../gcc-read-write/gcc/m2/gm2-libs/PushBackInput.mod", 54);
Debug_Halt ((const char *) "assert failed", 13, 113, (const char *) "../../gcc/m2/gm2-libs/PushBackInput.mod", 39);
}
}
}

34
gcc/m2/mc-boot/GRTExceptions.c
View file

@ -721,7 +721,7 @@ static void AddHandler (RTExceptions_EHBlock e, RTExceptions_Handler h)
static void indexf (void * a)
{
RTExceptions_Raise ( ((unsigned int) (M2EXCEPTION_indexException)), const_cast<void*> (reinterpret_cast<const void*>("../../gcc-read-write/gcc/m2/gm2-libs/RTExceptions.mod")), 613, 9, const_cast<void*> (reinterpret_cast<const void*>("indexf")), const_cast<void*> (reinterpret_cast<const void*>("array index out of bounds")));
RTExceptions_Raise ( ((unsigned int) (M2EXCEPTION_indexException)), const_cast<void*> (reinterpret_cast<const void*>("../../gcc/m2/gm2-libs/RTExceptions.mod")), 613, 9, const_cast<void*> (reinterpret_cast<const void*>("indexf")), const_cast<void*> (reinterpret_cast<const void*>("array index out of bounds")));
}
@ -731,7 +731,7 @@ static void indexf (void * a)
static void range (void * a)
{
RTExceptions_Raise ( ((unsigned int) (M2EXCEPTION_rangeException)), const_cast<void*> (reinterpret_cast<const void*>("../../gcc-read-write/gcc/m2/gm2-libs/RTExceptions.mod")), 625, 9, const_cast<void*> (reinterpret_cast<const void*>("range")), const_cast<void*> (reinterpret_cast<const void*>("assignment out of range")));
RTExceptions_Raise ( ((unsigned int) (M2EXCEPTION_rangeException)), const_cast<void*> (reinterpret_cast<const void*>("../../gcc/m2/gm2-libs/RTExceptions.mod")), 625, 9, const_cast<void*> (reinterpret_cast<const void*>("range")), const_cast<void*> (reinterpret_cast<const void*>("assignment out of range")));
}
@ -741,7 +741,7 @@ static void range (void * a)
static void casef (void * a)
{
RTExceptions_Raise ( ((unsigned int) (M2EXCEPTION_caseSelectException)), const_cast<void*> (reinterpret_cast<const void*>("../../gcc-read-write/gcc/m2/gm2-libs/RTExceptions.mod")), 637, 9, const_cast<void*> (reinterpret_cast<const void*>("casef")), const_cast<void*> (reinterpret_cast<const void*>("case selector out of range")));
RTExceptions_Raise ( ((unsigned int) (M2EXCEPTION_caseSelectException)), const_cast<void*> (reinterpret_cast<const void*>("../../gcc/m2/gm2-libs/RTExceptions.mod")), 637, 9, const_cast<void*> (reinterpret_cast<const void*>("casef")), const_cast<void*> (reinterpret_cast<const void*>("case selector out of range")));
}
@ -751,7 +751,7 @@ static void casef (void * a)
static void invalidloc (void * a)
{
RTExceptions_Raise ( ((unsigned int) (M2EXCEPTION_invalidLocation)), const_cast<void*> (reinterpret_cast<const void*>("../../gcc-read-write/gcc/m2/gm2-libs/RTExceptions.mod")), 649, 9, const_cast<void*> (reinterpret_cast<const void*>("invalidloc")), const_cast<void*> (reinterpret_cast<const void*>("invalid address referenced")));
RTExceptions_Raise ( ((unsigned int) (M2EXCEPTION_invalidLocation)), const_cast<void*> (reinterpret_cast<const void*>("../../gcc/m2/gm2-libs/RTExceptions.mod")), 649, 9, const_cast<void*> (reinterpret_cast<const void*>("invalidloc")), const_cast<void*> (reinterpret_cast<const void*>("invalid address referenced")));
}
@ -761,7 +761,7 @@ static void invalidloc (void * a)
static void function (void * a)
{
RTExceptions_Raise ( ((unsigned int) (M2EXCEPTION_functionException)), const_cast<void*> (reinterpret_cast<const void*>("../../gcc-read-write/gcc/m2/gm2-libs/RTExceptions.mod")), 661, 9, const_cast<void*> (reinterpret_cast<const void*>("function")), const_cast<void*> (reinterpret_cast<const void*>("... function ... "))); /* --fixme-- what has happened ? */
RTExceptions_Raise ( ((unsigned int) (M2EXCEPTION_functionException)), const_cast<void*> (reinterpret_cast<const void*>("../../gcc/m2/gm2-libs/RTExceptions.mod")), 661, 9, const_cast<void*> (reinterpret_cast<const void*>("function")), const_cast<void*> (reinterpret_cast<const void*>("... function ... "))); /* --fixme-- what has happened ? */
}
@ -771,7 +771,7 @@ static void function (void * a)
static void wholevalue (void * a)
{
RTExceptions_Raise ( ((unsigned int) (M2EXCEPTION_wholeValueException)), const_cast<void*> (reinterpret_cast<const void*>("../../gcc-read-write/gcc/m2/gm2-libs/RTExceptions.mod")), 673, 9, const_cast<void*> (reinterpret_cast<const void*>("wholevalue")), const_cast<void*> (reinterpret_cast<const void*>("illegal whole value exception")));
RTExceptions_Raise ( ((unsigned int) (M2EXCEPTION_wholeValueException)), const_cast<void*> (reinterpret_cast<const void*>("../../gcc/m2/gm2-libs/RTExceptions.mod")), 673, 9, const_cast<void*> (reinterpret_cast<const void*>("wholevalue")), const_cast<void*> (reinterpret_cast<const void*>("illegal whole value exception")));
}
@ -781,7 +781,7 @@ static void wholevalue (void * a)
static void wholediv (void * a)
{
RTExceptions_Raise ( ((unsigned int) (M2EXCEPTION_wholeDivException)), const_cast<void*> (reinterpret_cast<const void*>("../../gcc-read-write/gcc/m2/gm2-libs/RTExceptions.mod")), 685, 9, const_cast<void*> (reinterpret_cast<const void*>("wholediv")), const_cast<void*> (reinterpret_cast<const void*>("illegal whole value exception")));
RTExceptions_Raise ( ((unsigned int) (M2EXCEPTION_wholeDivException)), const_cast<void*> (reinterpret_cast<const void*>("../../gcc/m2/gm2-libs/RTExceptions.mod")), 685, 9, const_cast<void*> (reinterpret_cast<const void*>("wholediv")), const_cast<void*> (reinterpret_cast<const void*>("illegal whole value exception")));
}
@ -791,7 +791,7 @@ static void wholediv (void * a)
static void realvalue (void * a)
{
RTExceptions_Raise ( ((unsigned int) (M2EXCEPTION_realValueException)), const_cast<void*> (reinterpret_cast<const void*>("../../gcc-read-write/gcc/m2/gm2-libs/RTExceptions.mod")), 697, 9, const_cast<void*> (reinterpret_cast<const void*>("realvalue")), const_cast<void*> (reinterpret_cast<const void*>("illegal real value exception")));
RTExceptions_Raise ( ((unsigned int) (M2EXCEPTION_realValueException)), const_cast<void*> (reinterpret_cast<const void*>("../../gcc/m2/gm2-libs/RTExceptions.mod")), 697, 9, const_cast<void*> (reinterpret_cast<const void*>("realvalue")), const_cast<void*> (reinterpret_cast<const void*>("illegal real value exception")));
}
@ -801,7 +801,7 @@ static void realvalue (void * a)
static void realdiv (void * a)
{
RTExceptions_Raise ( ((unsigned int) (M2EXCEPTION_realDivException)), const_cast<void*> (reinterpret_cast<const void*>("../../gcc-read-write/gcc/m2/gm2-libs/RTExceptions.mod")), 709, 9, const_cast<void*> (reinterpret_cast<const void*>("realdiv")), const_cast<void*> (reinterpret_cast<const void*>("real number division by zero exception")));
RTExceptions_Raise ( ((unsigned int) (M2EXCEPTION_realDivException)), const_cast<void*> (reinterpret_cast<const void*>("../../gcc/m2/gm2-libs/RTExceptions.mod")), 709, 9, const_cast<void*> (reinterpret_cast<const void*>("realdiv")), const_cast<void*> (reinterpret_cast<const void*>("real number division by zero exception")));
}
@ -811,7 +811,7 @@ static void realdiv (void * a)
static void complexvalue (void * a)
{
RTExceptions_Raise ( ((unsigned int) (M2EXCEPTION_complexValueException)), const_cast<void*> (reinterpret_cast<const void*>("../../gcc-read-write/gcc/m2/gm2-libs/RTExceptions.mod")), 721, 9, const_cast<void*> (reinterpret_cast<const void*>("complexvalue")), const_cast<void*> (reinterpret_cast<const void*>("illegal complex value exception")));
RTExceptions_Raise ( ((unsigned int) (M2EXCEPTION_complexValueException)), const_cast<void*> (reinterpret_cast<const void*>("../../gcc/m2/gm2-libs/RTExceptions.mod")), 721, 9, const_cast<void*> (reinterpret_cast<const void*>("complexvalue")), const_cast<void*> (reinterpret_cast<const void*>("illegal complex value exception")));
}
@ -821,7 +821,7 @@ static void complexvalue (void * a)
static void complexdiv (void * a)
{
RTExceptions_Raise ( ((unsigned int) (M2EXCEPTION_complexDivException)), const_cast<void*> (reinterpret_cast<const void*>("../../gcc-read-write/gcc/m2/gm2-libs/RTExceptions.mod")), 733, 9, const_cast<void*> (reinterpret_cast<const void*>("complexdiv")), const_cast<void*> (reinterpret_cast<const void*>("complex number division by zero exception")));
RTExceptions_Raise ( ((unsigned int) (M2EXCEPTION_complexDivException)), const_cast<void*> (reinterpret_cast<const void*>("../../gcc/m2/gm2-libs/RTExceptions.mod")), 733, 9, const_cast<void*> (reinterpret_cast<const void*>("complexdiv")), const_cast<void*> (reinterpret_cast<const void*>("complex number division by zero exception")));
}
@ -831,7 +831,7 @@ static void complexdiv (void * a)
static void protection (void * a)
{
RTExceptions_Raise ( ((unsigned int) (M2EXCEPTION_protException)), const_cast<void*> (reinterpret_cast<const void*>("../../gcc-read-write/gcc/m2/gm2-libs/RTExceptions.mod")), 745, 9, const_cast<void*> (reinterpret_cast<const void*>("protection")), const_cast<void*> (reinterpret_cast<const void*>("protection exception")));
RTExceptions_Raise ( ((unsigned int) (M2EXCEPTION_protException)), const_cast<void*> (reinterpret_cast<const void*>("../../gcc/m2/gm2-libs/RTExceptions.mod")), 745, 9, const_cast<void*> (reinterpret_cast<const void*>("protection")), const_cast<void*> (reinterpret_cast<const void*>("protection exception")));
}
@ -841,7 +841,7 @@ static void protection (void * a)
static void systemf (void * a)
{
RTExceptions_Raise ( ((unsigned int) (M2EXCEPTION_sysException)), const_cast<void*> (reinterpret_cast<const void*>("../../gcc-read-write/gcc/m2/gm2-libs/RTExceptions.mod")), 757, 9, const_cast<void*> (reinterpret_cast<const void*>("systemf")), const_cast<void*> (reinterpret_cast<const void*>("system exception")));
RTExceptions_Raise ( ((unsigned int) (M2EXCEPTION_sysException)), const_cast<void*> (reinterpret_cast<const void*>("../../gcc/m2/gm2-libs/RTExceptions.mod")), 757, 9, const_cast<void*> (reinterpret_cast<const void*>("systemf")), const_cast<void*> (reinterpret_cast<const void*>("system exception")));
}
@ -851,7 +851,7 @@ static void systemf (void * a)
static void coroutine (void * a)
{
RTExceptions_Raise ( ((unsigned int) (M2EXCEPTION_coException)), const_cast<void*> (reinterpret_cast<const void*>("../../gcc-read-write/gcc/m2/gm2-libs/RTExceptions.mod")), 769, 9, const_cast<void*> (reinterpret_cast<const void*>("coroutine")), const_cast<void*> (reinterpret_cast<const void*>("coroutine exception")));
RTExceptions_Raise ( ((unsigned int) (M2EXCEPTION_coException)), const_cast<void*> (reinterpret_cast<const void*>("../../gcc/m2/gm2-libs/RTExceptions.mod")), 769, 9, const_cast<void*> (reinterpret_cast<const void*>("coroutine")), const_cast<void*> (reinterpret_cast<const void*>("coroutine exception")));
}
@ -861,7 +861,7 @@ static void coroutine (void * a)
static void exception (void * a)
{
RTExceptions_Raise ( ((unsigned int) (M2EXCEPTION_exException)), const_cast<void*> (reinterpret_cast<const void*>("../../gcc-read-write/gcc/m2/gm2-libs/RTExceptions.mod")), 781, 9, const_cast<void*> (reinterpret_cast<const void*>("exception")), const_cast<void*> (reinterpret_cast<const void*>("exception exception")));
RTExceptions_Raise ( ((unsigned int) (M2EXCEPTION_exException)), const_cast<void*> (reinterpret_cast<const void*>("../../gcc/m2/gm2-libs/RTExceptions.mod")), 781, 9, const_cast<void*> (reinterpret_cast<const void*>("exception")), const_cast<void*> (reinterpret_cast<const void*>("exception exception")));
}
@ -1180,13 +1180,13 @@ extern "C" RTExceptions_EHBlock RTExceptions_GetBaseExceptionBlock (void)
{
if (currentEHB == NULL)
{
M2RTS_Halt ((const char *) "../../gcc-read-write/gcc/m2/gm2-libs/RTExceptions.mod", 53, 599, (const char *) "GetBaseExceptionBlock", 21, (const char *) "currentEHB has not been initialized yet", 39);
M2RTS_Halt ((const char *) "../../gcc/m2/gm2-libs/RTExceptions.mod", 38, 599, (const char *) "GetBaseExceptionBlock", 21, (const char *) "currentEHB has not been initialized yet", 39);
}
else
{
return currentEHB;
}
ReturnException ("../../gcc-read-write/gcc/m2/gm2-libs/RTExceptions.def", 25, 1);
ReturnException ("../../gcc/m2/gm2-libs/RTExceptions.def", 25, 1);
__builtin_unreachable ();
}

20
gcc/m2/mc-boot/GRTint.c
View file

@ -595,7 +595,7 @@ static unsigned int activatePending (unsigned int untilInterrupt, RTint_Dispatch
default:
CaseException ("../../gcc-read-write/gcc/m2/gm2-libs/RTint.def", 25, 1);
CaseException ("../../gcc/m2/gm2-libs/RTint.def", 25, 1);
__builtin_unreachable ();
}
v = v->pending;
@ -708,7 +708,7 @@ extern "C" unsigned int RTint_InitOutputVector (int fd, unsigned int pri)
RTco_signal (lock);
return v->no;
}
ReturnException ("../../gcc-read-write/gcc/m2/gm2-libs/RTint.def", 25, 1);
ReturnException ("../../gcc/m2/gm2-libs/RTint.def", 25, 1);
__builtin_unreachable ();
}
@ -765,7 +765,7 @@ extern "C" void RTint_ReArmTimeVector (unsigned int vec, unsigned int micro, uns
v = FindVectorNo (vec);
if (v == NULL)
{
M2RTS_Halt ((const char *) "../../gcc-read-write/gcc/m2/gm2-libs/RTint.mod", 46, 286, (const char *) "ReArmTimeVector", 15, (const char *) "cannot find vector supplied", 27);
M2RTS_Halt ((const char *) "../../gcc/m2/gm2-libs/RTint.mod", 31, 286, (const char *) "ReArmTimeVector", 15, (const char *) "cannot find vector supplied", 27);
}
else
{
@ -790,7 +790,7 @@ extern "C" void RTint_GetTimeVector (unsigned int vec, unsigned int *micro, unsi
v = FindVectorNo (vec);
if (v == NULL)
{
M2RTS_Halt ((const char *) "../../gcc-read-write/gcc/m2/gm2-libs/RTint.mod", 46, 312, (const char *) "GetTimeVector", 13, (const char *) "cannot find vector supplied", 27);
M2RTS_Halt ((const char *) "../../gcc/m2/gm2-libs/RTint.mod", 31, 312, (const char *) "GetTimeVector", 13, (const char *) "cannot find vector supplied", 27);
}
else
{
@ -816,7 +816,7 @@ extern "C" void * RTint_AttachVector (unsigned int vec, void * p)
v = FindVectorNo (vec);
if (v == NULL)
{
M2RTS_Halt ((const char *) "../../gcc-read-write/gcc/m2/gm2-libs/RTint.mod", 46, 339, (const char *) "AttachVector", 12, (const char *) "cannot find vector supplied", 27);
M2RTS_Halt ((const char *) "../../gcc/m2/gm2-libs/RTint.mod", 31, 339, (const char *) "AttachVector", 12, (const char *) "cannot find vector supplied", 27);
}
else
{
@ -830,7 +830,7 @@ extern "C" void * RTint_AttachVector (unsigned int vec, void * p)
RTco_signal (lock);
return l;
}
ReturnException ("../../gcc-read-write/gcc/m2/gm2-libs/RTint.def", 25, 1);
ReturnException ("../../gcc/m2/gm2-libs/RTint.def", 25, 1);
__builtin_unreachable ();
}
@ -855,7 +855,7 @@ extern "C" void RTint_IncludeVector (unsigned int vec)
v = FindVectorNo (vec);
if (v == NULL)
{
M2RTS_Halt ((const char *) "../../gcc-read-write/gcc/m2/gm2-libs/RTint.mod", 46, 372, (const char *) "IncludeVector", 13, (const char *) "cannot find vector supplied", 27);
M2RTS_Halt ((const char *) "../../gcc/m2/gm2-libs/RTint.mod", 31, 372, (const char *) "IncludeVector", 13, (const char *) "cannot find vector supplied", 27);
}
else
{
@ -902,7 +902,7 @@ extern "C" void RTint_ExcludeVector (unsigned int vec)
v = FindPendingVector (vec);
if (v == NULL)
{
M2RTS_Halt ((const char *) "../../gcc-read-write/gcc/m2/gm2-libs/RTint.mod", 46, 415, (const char *) "ExcludeVector", 13, (const char *) "cannot find pending vector supplied", 35);
M2RTS_Halt ((const char *) "../../gcc/m2/gm2-libs/RTint.mod", 31, 415, (const char *) "ExcludeVector", 13, (const char *) "cannot find pending vector supplied", 35);
}
else
{
@ -1003,7 +1003,7 @@ extern "C" void RTint_Listen (unsigned int untilInterrupt, RTint_DispatchVector
default:
CaseException ("../../gcc-read-write/gcc/m2/gm2-libs/RTint.def", 25, 1);
CaseException ("../../gcc/m2/gm2-libs/RTint.def", 25, 1);
__builtin_unreachable ();
}
v = v->pending;
@ -1016,7 +1016,7 @@ extern "C" void RTint_Listen (unsigned int untilInterrupt, RTint_DispatchVector
}
if (((untilInterrupt && (i == NULL)) && (o == NULL)) && ! found)
{
M2RTS_Halt ((const char *) "../../gcc-read-write/gcc/m2/gm2-libs/RTint.mod", 46, 731, (const char *) "Listen", 6, (const char *) "deadlock found, no more processes to run and no interrupts active", 65);
M2RTS_Halt ((const char *) "../../gcc/m2/gm2-libs/RTint.mod", 31, 731, (const char *) "Listen", 6, (const char *) "deadlock found, no more processes to run and no interrupts active", 65);
}
/* printf('}
') ; */

4
gcc/m2/mc-boot/GStdIO.c
View file

@ -193,7 +193,7 @@ extern "C" StdIO_ProcWrite StdIO_GetCurrentOutput (void)
M2RTS_HALT (-1);
__builtin_unreachable ();
}
ReturnException ("../../gcc-read-write/gcc/m2/gm2-libs/StdIO.def", 25, 1);
ReturnException ("../../gcc/m2/gm2-libs/StdIO.def", 25, 1);
__builtin_unreachable ();
}
@ -252,7 +252,7 @@ extern "C" StdIO_ProcRead StdIO_GetCurrentInput (void)
M2RTS_HALT (-1);
__builtin_unreachable ();
}
ReturnException ("../../gcc-read-write/gcc/m2/gm2-libs/StdIO.def", 25, 1);
ReturnException ("../../gcc/m2/gm2-libs/StdIO.def", 25, 1);
__builtin_unreachable ();
}

4
gcc/m2/mc-boot/GStringConvert.c
View file

@ -1916,7 +1916,7 @@ extern "C" DynamicStrings_String StringConvert_ToSigFig (DynamicStrings_String s
int point;
unsigned int poTen;
Assert ((IsDigit (DynamicStrings_char (s, 0))) || ((DynamicStrings_char (s, 0)) == '.'), (const char *) "../../gcc-read-write/gcc/m2/gm2-libs/StringConvert.mod", 54, 1222, (const char *) "ToSigFig", 8);
Assert ((IsDigit (DynamicStrings_char (s, 0))) || ((DynamicStrings_char (s, 0)) == '.'), (const char *) "../../gcc/m2/gm2-libs/StringConvert.mod", 39, 1222, (const char *) "ToSigFig", 8);
point = DynamicStrings_Index (s, '.', 0);
if (point < 0)
{
@ -1968,7 +1968,7 @@ extern "C" DynamicStrings_String StringConvert_ToDecimalPlaces (DynamicStrings_S
{
int point;
Assert ((IsDigit (DynamicStrings_char (s, 0))) || ((DynamicStrings_char (s, 0)) == '.'), (const char *) "../../gcc-read-write/gcc/m2/gm2-libs/StringConvert.mod", 54, 1069, (const char *) "ToDecimalPlaces", 15);
Assert ((IsDigit (DynamicStrings_char (s, 0))) || ((DynamicStrings_char (s, 0)) == '.'), (const char *) "../../gcc/m2/gm2-libs/StringConvert.mod", 39, 1069, (const char *) "ToDecimalPlaces", 15);
point = DynamicStrings_Index (s, '.', 0);
if (point < 0)
{

6
gcc/m2/mc-boot/GSysStorage.c
View file

@ -93,7 +93,7 @@ extern "C" void SysStorage_ALLOCATE (void * *a, unsigned int size)
(*a) = libc_malloc (static_cast<size_t> (size));
if ((*a) == NULL)
{
Debug_Halt ((const char *) "out of memory error", 19, 50, (const char *) "../../gcc-read-write/gcc/m2/gm2-libs/SysStorage.mod", 51);
Debug_Halt ((const char *) "out of memory error", 19, 50, (const char *) "../../gcc/m2/gm2-libs/SysStorage.mod", 36);
}
if (enableTrace && trace)
{
@ -118,7 +118,7 @@ extern "C" void SysStorage_DEALLOCATE (void * *a, unsigned int size)
}
if ((libc_memset ((*a), 0, static_cast<size_t> (size))) != (*a))
{
Debug_Halt ((const char *) "memset should have returned the first parameter", 47, 76, (const char *) "../../gcc-read-write/gcc/m2/gm2-libs/SysStorage.mod", 51);
Debug_Halt ((const char *) "memset should have returned the first parameter", 47, 76, (const char *) "../../gcc/m2/gm2-libs/SysStorage.mod", 36);
}
}
if (enableDeallocation)
@ -163,7 +163,7 @@ extern "C" void SysStorage_REALLOCATE (void * *a, unsigned int size)
(*a) = libc_realloc ((*a), static_cast<size_t> (size));
if ((*a) == NULL)
{
Debug_Halt ((const char *) "out of memory error", 19, 119, (const char *) "../../gcc-read-write/gcc/m2/gm2-libs/SysStorage.mod", 51);
Debug_Halt ((const char *) "out of memory error", 19, 119, (const char *) "../../gcc/m2/gm2-libs/SysStorage.mod", 36);
}
if (enableTrace && trace)
{

141
gcc/m2/mc-boot/Gdecl.c
View file

@ -1027,10 +1027,10 @@ extern "C" void SYSTEM_ShiftRight (unsigned int *s, unsigned int _s_high, unsign
extern "C" void SYSTEM_RotateVal (unsigned int *s, unsigned int _s_high, unsigned int *d, unsigned int _d_high, unsigned int SetSizeInBits, int RotateCount);
extern "C" void SYSTEM_RotateLeft (unsigned int *s, unsigned int _s_high, unsigned int *d, unsigned int _d_high, unsigned int SetSizeInBits, unsigned int RotateCount);
extern "C" void SYSTEM_RotateRight (unsigned int *s, unsigned int _s_high, unsigned int *d, unsigned int _d_high, unsigned int SetSizeInBits, unsigned int RotateCount);
extern "C" void M2RTS_ConstructModules (void * applicationmodule, int argc, void * argv, void * envp);
extern "C" void M2RTS_DeconstructModules (void * applicationmodule, int argc, void * argv, void * envp);
extern "C" void M2RTS_RegisterModule (void * name, M2RTS_ArgCVEnvP init, M2RTS_ArgCVEnvP fini, PROC dependencies);
extern "C" void M2RTS_RequestDependant (void * modulename, void * dependantmodule);
extern "C" void M2RTS_ConstructModules (void * applicationmodule, void * libname, int argc, void * argv, void * envp);
extern "C" void M2RTS_DeconstructModules (void * applicationmodule, void * libname, int argc, void * argv, void * envp);
extern "C" void M2RTS_RegisterModule (void * name, void * libname, M2RTS_ArgCVEnvP init, M2RTS_ArgCVEnvP fini, PROC dependencies);
extern "C" void M2RTS_RequestDependant (void * modulename, void * libname, void * dependantmodule, void * dependantlibname);
extern "C" unsigned int M2RTS_InstallTerminationProcedure (PROC p);
extern "C" void M2RTS_ExecuteInitialProcedures (void);
extern "C" unsigned int M2RTS_InstallInitialProcedure (PROC p);
@ -2782,6 +2782,7 @@ extern "C" void * libc_memcpy (void * dest, void * src, size_t size);
extern "C" void * libc_memset (void * s, int c, size_t size);
extern "C" void * libc_memmove (void * dest, void * src, size_t size);
extern "C" int libc_printf (const char *format_, unsigned int _format_high, ...);
extern "C" int libc_snprintf (void * dest, size_t size, const char *format_, unsigned int _format_high, ...);
extern "C" int libc_setenv (void * name, void * value, int overwrite);
extern "C" void libc_srand (int seed);
extern "C" int libc_rand (void);
@ -6679,7 +6680,7 @@ static decl_node newNode (decl_nodeT k)
d->at.firstUsed = 0;
return d;
}
ReturnException ("../../gcc-read-write/gcc/m2/mc/decl.def", 20, 1);
ReturnException ("../../gcc/m2/mc/decl.def", 20, 1);
__builtin_unreachable ();
}
@ -7039,7 +7040,7 @@ static decl_node addToScope (decl_node n)
}
M2RTS_HALT (-1);
__builtin_unreachable ();
ReturnException ("../../gcc-read-write/gcc/m2/mc/decl.def", 20, 1);
ReturnException ("../../gcc/m2/mc/decl.def", 20, 1);
__builtin_unreachable ();
}
@ -7117,7 +7118,7 @@ static void setUnary (decl_node u, decl_nodeT k, decl_node a, decl_node t)
default:
CaseException ("../../gcc-read-write/gcc/m2/mc/decl.def", 20, 1);
CaseException ("../../gcc/m2/mc/decl.def", 20, 1);
__builtin_unreachable ();
}
}
@ -7400,7 +7401,7 @@ static void putFieldVarient (decl_node f, decl_node v)
default:
CaseException ("../../gcc-read-write/gcc/m2/mc/decl.def", 20, 1);
CaseException ("../../gcc/m2/mc/decl.def", 20, 1);
__builtin_unreachable ();
}
switch (f->kind)
@ -7411,7 +7412,7 @@ static void putFieldVarient (decl_node f, decl_node v)
default:
CaseException ("../../gcc-read-write/gcc/m2/mc/decl.def", 20, 1);
CaseException ("../../gcc/m2/mc/decl.def", 20, 1);
__builtin_unreachable ();
}
}
@ -7462,7 +7463,7 @@ static decl_node putFieldRecord (decl_node r, nameKey_Name tag, decl_node type,
default:
CaseException ("../../gcc-read-write/gcc/m2/mc/decl.def", 20, 1);
CaseException ("../../gcc/m2/mc/decl.def", 20, 1);
__builtin_unreachable ();
}
/* fill in, n. */
@ -7520,7 +7521,7 @@ static void putVarientTag (decl_node v, decl_node tag)
default:
CaseException ("../../gcc-read-write/gcc/m2/mc/decl.def", 20, 1);
CaseException ("../../gcc/m2/mc/decl.def", 20, 1);
__builtin_unreachable ();
}
}
@ -7544,7 +7545,7 @@ static decl_node getParent (decl_node n)
default:
CaseException ("../../gcc-read-write/gcc/m2/mc/decl.def", 20, 1);
CaseException ("../../gcc/m2/mc/decl.def", 20, 1);
__builtin_unreachable ();
}
/* static analysis guarentees a RETURN statement will be used before here. */
@ -7572,7 +7573,7 @@ static decl_node getRecord (decl_node n)
default:
CaseException ("../../gcc-read-write/gcc/m2/mc/decl.def", 20, 1);
CaseException ("../../gcc/m2/mc/decl.def", 20, 1);
__builtin_unreachable ();
}
/* static analysis guarentees a RETURN statement will be used before here. */
@ -7752,7 +7753,7 @@ static unsigned int getConstExpComplete (decl_node n)
default:
CaseException ("../../gcc-read-write/gcc/m2/mc/decl.def", 20, 1);
CaseException ("../../gcc/m2/mc/decl.def", 20, 1);
__builtin_unreachable ();
}
/* static analysis guarentees a RETURN statement will be used before here. */
@ -7857,7 +7858,7 @@ static decl_node makeVal (decl_node params)
M2RTS_HALT (-1);
__builtin_unreachable ();
}
ReturnException ("../../gcc-read-write/gcc/m2/mc/decl.def", 20, 1);
ReturnException ("../../gcc/m2/mc/decl.def", 20, 1);
__builtin_unreachable ();
}
@ -7878,7 +7879,7 @@ static decl_node makeCast (decl_node c, decl_node p)
M2RTS_HALT (-1);
__builtin_unreachable ();
}
ReturnException ("../../gcc-read-write/gcc/m2/mc/decl.def", 20, 1);
ReturnException ("../../gcc/m2/mc/decl.def", 20, 1);
__builtin_unreachable ();
}
@ -8388,7 +8389,7 @@ static decl_node makeUnary (decl_nodeT k, decl_node e, decl_node res)
default:
CaseException ("../../gcc-read-write/gcc/m2/mc/decl.def", 20, 1);
CaseException ("../../gcc/m2/mc/decl.def", 20, 1);
__builtin_unreachable ();
}
}
@ -8482,7 +8483,7 @@ static DynamicStrings_String getStringContents (decl_node n)
}
M2RTS_HALT (-1);
__builtin_unreachable ();
ReturnException ("../../gcc-read-write/gcc/m2/mc/decl.def", 20, 1);
ReturnException ("../../gcc/m2/mc/decl.def", 20, 1);
__builtin_unreachable ();
}
@ -8618,7 +8619,7 @@ static decl_node doMakeBinary (decl_nodeT k, decl_node l, decl_node r, decl_node
default:
CaseException ("../../gcc-read-write/gcc/m2/mc/decl.def", 20, 1);
CaseException ("../../gcc/m2/mc/decl.def", 20, 1);
__builtin_unreachable ();
}
return n;
@ -9218,12 +9219,12 @@ static decl_node doGetExprType (decl_node n)
default:
CaseException ("../../gcc-read-write/gcc/m2/mc/decl.def", 20, 1);
CaseException ("../../gcc/m2/mc/decl.def", 20, 1);
__builtin_unreachable ();
}
M2RTS_HALT (-1);
__builtin_unreachable ();
ReturnException ("../../gcc-read-write/gcc/m2/mc/decl.def", 20, 1);
ReturnException ("../../gcc/m2/mc/decl.def", 20, 1);
__builtin_unreachable ();
}
@ -9362,12 +9363,12 @@ static decl_node getSymScope (decl_node n)
default:
CaseException ("../../gcc-read-write/gcc/m2/mc/decl.def", 20, 1);
CaseException ("../../gcc/m2/mc/decl.def", 20, 1);
__builtin_unreachable ();
}
M2RTS_HALT (-1);
__builtin_unreachable ();
ReturnException ("../../gcc-read-write/gcc/m2/mc/decl.def", 20, 1);
ReturnException ("../../gcc/m2/mc/decl.def", 20, 1);
__builtin_unreachable ();
}
@ -9679,7 +9680,7 @@ static unsigned int needsParen (decl_node n)
default:
CaseException ("../../gcc-read-write/gcc/m2/mc/decl.def", 20, 1);
CaseException ("../../gcc/m2/mc/decl.def", 20, 1);
__builtin_unreachable ();
}
return TRUE;
@ -9788,7 +9789,7 @@ static void doPolyBinary (mcPretty_pretty p, decl_nodeT op, decl_node left, decl
default:
CaseException ("../../gcc-read-write/gcc/m2/mc/decl.def", 20, 1);
CaseException ("../../gcc/m2/mc/decl.def", 20, 1);
__builtin_unreachable ();
}
}
@ -9814,7 +9815,7 @@ static void doPolyBinary (mcPretty_pretty p, decl_nodeT op, decl_node left, decl
default:
CaseException ("../../gcc-read-write/gcc/m2/mc/decl.def", 20, 1);
CaseException ("../../gcc/m2/mc/decl.def", 20, 1);
__builtin_unreachable ();
}
}
@ -10092,7 +10093,7 @@ static decl_node doGetLastOp (decl_node a, decl_node b)
default:
CaseException ("../../gcc-read-write/gcc/m2/mc/decl.def", 20, 1);
CaseException ("../../gcc/m2/mc/decl.def", 20, 1);
__builtin_unreachable ();
}
/* static analysis guarentees a RETURN statement will be used before here. */
@ -10732,7 +10733,7 @@ static void doExprC (mcPretty_pretty p, decl_node n)
default:
CaseException ("../../gcc-read-write/gcc/m2/mc/decl.def", 20, 1);
CaseException ("../../gcc/m2/mc/decl.def", 20, 1);
__builtin_unreachable ();
}
}
@ -10937,7 +10938,7 @@ static void doExprM2 (mcPretty_pretty p, decl_node n)
default:
CaseException ("../../gcc-read-write/gcc/m2/mc/decl.def", 20, 1);
CaseException ("../../gcc/m2/mc/decl.def", 20, 1);
__builtin_unreachable ();
}
}
@ -11109,7 +11110,7 @@ static DynamicStrings_String replaceChar (DynamicStrings_String s, char ch, cons
return s;
}
}
ReturnException ("../../gcc-read-write/gcc/m2/mc/decl.def", 20, 1);
ReturnException ("../../gcc/m2/mc/decl.def", 20, 1);
__builtin_unreachable ();
}
@ -11169,7 +11170,7 @@ static unsigned int countChar (DynamicStrings_String s, char ch)
return c;
}
}
ReturnException ("../../gcc-read-write/gcc/m2/mc/decl.def", 20, 1);
ReturnException ("../../gcc/m2/mc/decl.def", 20, 1);
__builtin_unreachable ();
}
@ -12228,7 +12229,7 @@ static decl_node doMin (decl_node n)
M2RTS_HALT (-1); /* finish the cacading elsif statement. */
__builtin_unreachable ();
}
ReturnException ("../../gcc-read-write/gcc/m2/mc/decl.def", 20, 1);
ReturnException ("../../gcc/m2/mc/decl.def", 20, 1);
__builtin_unreachable ();
}
@ -12309,7 +12310,7 @@ static decl_node doMax (decl_node n)
M2RTS_HALT (-1); /* finish the cacading elsif statement. */
__builtin_unreachable ();
}
ReturnException ("../../gcc-read-write/gcc/m2/mc/decl.def", 20, 1);
ReturnException ("../../gcc/m2/mc/decl.def", 20, 1);
__builtin_unreachable ();
}
@ -12598,7 +12599,7 @@ static void doBaseC (mcPretty_pretty p, decl_node n)
default:
CaseException ("../../gcc-read-write/gcc/m2/mc/decl.def", 20, 1);
CaseException ("../../gcc/m2/mc/decl.def", 20, 1);
__builtin_unreachable ();
}
mcPretty_setNeedSpace (p);
@ -12688,7 +12689,7 @@ static void doSystemC (mcPretty_pretty p, decl_node n)
default:
CaseException ("../../gcc-read-write/gcc/m2/mc/decl.def", 20, 1);
CaseException ("../../gcc/m2/mc/decl.def", 20, 1);
__builtin_unreachable ();
}
}
@ -16042,7 +16043,7 @@ static void doCreal (mcPretty_pretty p, decl_node t)
default:
CaseException ("../../gcc-read-write/gcc/m2/mc/decl.def", 20, 1);
CaseException ("../../gcc/m2/mc/decl.def", 20, 1);
__builtin_unreachable ();
}
}
@ -16073,7 +16074,7 @@ static void doCimag (mcPretty_pretty p, decl_node t)
default:
CaseException ("../../gcc-read-write/gcc/m2/mc/decl.def", 20, 1);
CaseException ("../../gcc/m2/mc/decl.def", 20, 1);
__builtin_unreachable ();
}
}
@ -16204,7 +16205,7 @@ static void doIntrinsicC (mcPretty_pretty p, decl_node n)
default:
CaseException ("../../gcc-read-write/gcc/m2/mc/decl.def", 20, 1);
CaseException ("../../gcc/m2/mc/decl.def", 20, 1);
__builtin_unreachable ();
}
outText (p, (const char *) ";", 1);
@ -17366,7 +17367,7 @@ static void dbs (decl_dependentState s, decl_node n)
default:
CaseException ("../../gcc-read-write/gcc/m2/mc/decl.def", 20, 1);
CaseException ("../../gcc/m2/mc/decl.def", 20, 1);
__builtin_unreachable ();
}
if (n != NULL)
@ -18259,10 +18260,10 @@ static decl_dependentState doDependants (alists_alist l, decl_node n)
default:
CaseException ("../../gcc-read-write/gcc/m2/mc/decl.def", 20, 1);
CaseException ("../../gcc/m2/mc/decl.def", 20, 1);
__builtin_unreachable ();
}
ReturnException ("../../gcc-read-write/gcc/m2/mc/decl.def", 20, 1);
ReturnException ("../../gcc/m2/mc/decl.def", 20, 1);
__builtin_unreachable ();
}
@ -18359,7 +18360,7 @@ static void visitIntrinsicFunction (alists_alist v, decl_node n, decl_nodeProced
default:
CaseException ("../../gcc-read-write/gcc/m2/mc/decl.def", 20, 1);
CaseException ("../../gcc/m2/mc/decl.def", 20, 1);
__builtin_unreachable ();
}
}
@ -19358,7 +19359,7 @@ static void visitDependants (alists_alist v, decl_node n, decl_nodeProcedure p)
default:
CaseException ("../../gcc-read-write/gcc/m2/mc/decl.def", 20, 1);
CaseException ("../../gcc/m2/mc/decl.def", 20, 1);
__builtin_unreachable ();
}
}
@ -19705,12 +19706,12 @@ static DynamicStrings_String genKind (decl_node n)
default:
CaseException ("../../gcc-read-write/gcc/m2/mc/decl.def", 20, 1);
CaseException ("../../gcc/m2/mc/decl.def", 20, 1);
__builtin_unreachable ();
}
M2RTS_HALT (-1);
__builtin_unreachable ();
ReturnException ("../../gcc-read-write/gcc/m2/mc/decl.def", 20, 1);
ReturnException ("../../gcc/m2/mc/decl.def", 20, 1);
__builtin_unreachable ();
}
@ -20885,7 +20886,7 @@ static void doBaseM2 (mcPretty_pretty p, decl_node n)
default:
CaseException ("../../gcc-read-write/gcc/m2/mc/decl.def", 20, 1);
CaseException ("../../gcc/m2/mc/decl.def", 20, 1);
__builtin_unreachable ();
}
mcPretty_setNeedSpace (p);
@ -20911,7 +20912,7 @@ static void doSystemM2 (mcPretty_pretty p, decl_node n)
default:
CaseException ("../../gcc-read-write/gcc/m2/mc/decl.def", 20, 1);
CaseException ("../../gcc/m2/mc/decl.def", 20, 1);
__builtin_unreachable ();
}
}
@ -22122,10 +22123,10 @@ static decl_node doDupExpr (decl_node n)
default:
CaseException ("../../gcc-read-write/gcc/m2/mc/decl.def", 20, 1);
CaseException ("../../gcc/m2/mc/decl.def", 20, 1);
__builtin_unreachable ();
}
ReturnException ("../../gcc-read-write/gcc/m2/mc/decl.def", 20, 1);
ReturnException ("../../gcc/m2/mc/decl.def", 20, 1);
__builtin_unreachable ();
}
@ -22455,7 +22456,7 @@ extern "C" unsigned int decl_isVisited (decl_node n)
default:
CaseException ("../../gcc-read-write/gcc/m2/mc/decl.def", 20, 1);
CaseException ("../../gcc/m2/mc/decl.def", 20, 1);
__builtin_unreachable ();
}
/* static analysis guarentees a RETURN statement will be used before here. */
@ -22485,7 +22486,7 @@ extern "C" void decl_unsetVisited (decl_node n)
default:
CaseException ("../../gcc-read-write/gcc/m2/mc/decl.def", 20, 1);
CaseException ("../../gcc/m2/mc/decl.def", 20, 1);
__builtin_unreachable ();
}
}
@ -22513,7 +22514,7 @@ extern "C" void decl_setVisited (decl_node n)
default:
CaseException ("../../gcc-read-write/gcc/m2/mc/decl.def", 20, 1);
CaseException ("../../gcc/m2/mc/decl.def", 20, 1);
__builtin_unreachable ();
}
}
@ -22541,7 +22542,7 @@ extern "C" void decl_setEnumsComplete (decl_node n)
default:
CaseException ("../../gcc-read-write/gcc/m2/mc/decl.def", 20, 1);
CaseException ("../../gcc/m2/mc/decl.def", 20, 1);
__builtin_unreachable ();
}
}
@ -22569,7 +22570,7 @@ extern "C" unsigned int decl_getEnumsComplete (decl_node n)
default:
CaseException ("../../gcc-read-write/gcc/m2/mc/decl.def", 20, 1);
CaseException ("../../gcc/m2/mc/decl.def", 20, 1);
__builtin_unreachable ();
}
/* static analysis guarentees a RETURN statement will be used before here. */
@ -22790,7 +22791,7 @@ extern "C" decl_node decl_lookupInScope (decl_node scope, nameKey_Name n)
default:
CaseException ("../../gcc-read-write/gcc/m2/mc/decl.def", 20, 1);
CaseException ("../../gcc/m2/mc/decl.def", 20, 1);
__builtin_unreachable ();
}
/* static analysis guarentees a RETURN statement will be used before here. */
@ -23165,12 +23166,12 @@ extern "C" decl_node decl_getType (decl_node n)
default:
CaseException ("../../gcc-read-write/gcc/m2/mc/decl.def", 20, 1);
CaseException ("../../gcc/m2/mc/decl.def", 20, 1);
__builtin_unreachable ();
}
M2RTS_HALT (-1);
__builtin_unreachable ();
ReturnException ("../../gcc-read-write/gcc/m2/mc/decl.def", 20, 1);
ReturnException ("../../gcc/m2/mc/decl.def", 20, 1);
__builtin_unreachable ();
}
@ -23564,7 +23565,7 @@ extern "C" decl_node decl_getScope (decl_node n)
default:
CaseException ("../../gcc-read-write/gcc/m2/mc/decl.def", 20, 1);
CaseException ("../../gcc/m2/mc/decl.def", 20, 1);
__builtin_unreachable ();
}
/* static analysis guarentees a RETURN statement will be used before here. */
@ -24219,7 +24220,7 @@ extern "C" decl_node decl_makeVarient (decl_node r)
default:
CaseException ("../../gcc-read-write/gcc/m2/mc/decl.def", 20, 1);
CaseException ("../../gcc/m2/mc/decl.def", 20, 1);
__builtin_unreachable ();
}
return n;
@ -24686,7 +24687,7 @@ extern "C" nameKey_Name decl_getSymName (decl_node n)
__builtin_unreachable ();
break;
}
ReturnException ("../../gcc-read-write/gcc/m2/mc/decl.def", 20, 1);
ReturnException ("../../gcc/m2/mc/decl.def", 20, 1);
__builtin_unreachable ();
}
@ -24724,7 +24725,7 @@ extern "C" decl_node decl_import (decl_node m, decl_node n)
default:
CaseException ("../../gcc-read-write/gcc/m2/mc/decl.def", 20, 1);
CaseException ("../../gcc/m2/mc/decl.def", 20, 1);
__builtin_unreachable ();
}
importEnumFields (m, n);
@ -24853,7 +24854,7 @@ extern "C" void decl_setSource (decl_node n, nameKey_Name s)
default:
CaseException ("../../gcc-read-write/gcc/m2/mc/decl.def", 20, 1);
CaseException ("../../gcc/m2/mc/decl.def", 20, 1);
__builtin_unreachable ();
}
}
@ -24881,7 +24882,7 @@ extern "C" nameKey_Name decl_getSource (decl_node n)
default:
CaseException ("../../gcc-read-write/gcc/m2/mc/decl.def", 20, 1);
CaseException ("../../gcc/m2/mc/decl.def", 20, 1);
__builtin_unreachable ();
}
/* static analysis guarentees a RETURN statement will be used before here. */
@ -25324,7 +25325,7 @@ extern "C" void decl_addParameter (decl_node proc, decl_node param)
default:
CaseException ("../../gcc-read-write/gcc/m2/mc/decl.def", 20, 1);
CaseException ("../../gcc/m2/mc/decl.def", 20, 1);
__builtin_unreachable ();
}
}
@ -25417,7 +25418,7 @@ extern "C" decl_node decl_makeBinaryTok (mcReserved_toktype op, decl_node l, dec
M2RTS_HALT (-1); /* most likely op needs a clause as above. */
__builtin_unreachable ();
}
ReturnException ("../../gcc-read-write/gcc/m2/mc/decl.def", 20, 1);
ReturnException ("../../gcc/m2/mc/decl.def", 20, 1);
__builtin_unreachable ();
}
@ -25449,7 +25450,7 @@ extern "C" decl_node decl_makeUnaryTok (mcReserved_toktype op, decl_node e)
M2RTS_HALT (-1); /* most likely op needs a clause as above. */
__builtin_unreachable ();
}
ReturnException ("../../gcc-read-write/gcc/m2/mc/decl.def", 20, 1);
ReturnException ("../../gcc/m2/mc/decl.def", 20, 1);
__builtin_unreachable ();
}
@ -25887,7 +25888,7 @@ extern "C" void decl_setConstExpComplete (decl_node n)
default:
CaseException ("../../gcc-read-write/gcc/m2/mc/decl.def", 20, 1);
CaseException ("../../gcc/m2/mc/decl.def", 20, 1);
__builtin_unreachable ();
}
}
@ -26252,7 +26253,7 @@ extern "C" void decl_putBegin (decl_node b, decl_node s)
default:
CaseException ("../../gcc-read-write/gcc/m2/mc/decl.def", 20, 1);
CaseException ("../../gcc/m2/mc/decl.def", 20, 1);
__builtin_unreachable ();
}
}
@ -26279,7 +26280,7 @@ extern "C" void decl_putFinally (decl_node b, decl_node s)
default:
CaseException ("../../gcc-read-write/gcc/m2/mc/decl.def", 20, 1);
CaseException ("../../gcc/m2/mc/decl.def", 20, 1);
__builtin_unreachable ();
}
}
@ -26907,7 +26908,7 @@ extern "C" void decl_out (void)
default:
CaseException ("../../gcc-read-write/gcc/m2/mc/decl.def", 20, 1);
CaseException ("../../gcc/m2/mc/decl.def", 20, 1);
__builtin_unreachable ();
}
closeOutput ();

2
gcc/m2/mc-boot/Gkeyc.c
View file

@ -908,7 +908,7 @@ static unsigned int mangleN (nameKey_Name n, DynamicStrings_String *m, unsigned
return TRUE;
}
}
ReturnException ("../../gcc-read-write/gcc/m2/mc/keyc.def", 20, 1);
ReturnException ("../../gcc/m2/mc/keyc.def", 20, 1);
__builtin_unreachable ();
}

1
gcc/m2/mc-boot/Glibc.h
View file

@ -305,6 +305,7 @@ EXTERN void * libc_memset (void * s, int c, size_t size);
EXTERN void * libc_memmove (void * dest, void * src, size_t size);
EXTERN int libc_printf (const char *format_, unsigned int _format_high, ...);
EXTERN int libc_snprintf (void * dest, size_t size, const char *format_, unsigned int _format_high, ...);
/*
setenv - sets environment variable, name, to value.

2
gcc/m2/mc-boot/GmcComment.c
View file

@ -257,7 +257,7 @@ static void dumpComment (mcComment_commentDesc cd)
default:
CaseException ("../../gcc-read-write/gcc/m2/mc/mcComment.def", 20, 1);
CaseException ("../../gcc/m2/mc/mcComment.def", 20, 1);
__builtin_unreachable ();
}
if (cd->used)

4
gcc/m2/mc-boot/GmcComp.c
View file

@ -294,7 +294,7 @@ static decl_node examineCompilationUnit (void)
}
mcflex_mcError (DynamicStrings_string (DynamicStrings_InitString ((const char *) "failed to find module name", 26)));
libc_exit (1);
ReturnException ("../../gcc-read-write/gcc/m2/mc/mcComp.def", 20, 1);
ReturnException ("../../gcc/m2/mc/mcComp.def", 20, 1);
__builtin_unreachable ();
}
@ -324,7 +324,7 @@ static decl_node peepInto (DynamicStrings_String s)
mcPrintf_fprintf1 (FIO_StdErr, (const char *) "failed to open %s\\n", 19, (const unsigned char *) &s, (sizeof (s)-1));
libc_exit (1);
}
ReturnException ("../../gcc-read-write/gcc/m2/mc/mcComp.def", 20, 1);
ReturnException ("../../gcc/m2/mc/mcComp.def", 20, 1);
__builtin_unreachable ();
}

2
gcc/m2/mc-boot/GmcDebug.c
View file

@ -54,7 +54,7 @@ extern "C" void mcDebug_assert (unsigned int q)
{
if (! q)
{
mcError_internalError ((const char *) "assert failed", 13, (const char *) "../../gcc-read-write/gcc/m2/mc/mcDebug.mod", 42, 35);
mcError_internalError ((const char *) "assert failed", 13, (const char *) "../../gcc/m2/mc/mcDebug.mod", 27, 35);
}
}

8
gcc/m2/mc-boot/GmcMetaError.c
View file

@ -408,7 +408,7 @@ static void internalFormat (DynamicStrings_String s, int i, const char *m_, unsi
s = DynamicStrings_ConCatChar (s, '^');
s = SFIO_WriteS (FIO_StdOut, s);
FIO_WriteLine (FIO_StdOut);
mcError_internalError ((const char *) m, _m_high, (const char *) "../../gcc-read-write/gcc/m2/mc/mcMetaError.mod", 46, 97);
mcError_internalError ((const char *) m, _m_high, (const char *) "../../gcc/m2/mc/mcMetaError.mod", 31, 97);
}
@ -420,7 +420,7 @@ static DynamicStrings_String x (DynamicStrings_String a, DynamicStrings_String b
{
if (a != b)
{
mcError_internalError ((const char *) "different string returned", 25, (const char *) "../../gcc-read-write/gcc/m2/mc/mcMetaError.mod", 46, 109);
mcError_internalError ((const char *) "different string returned", 25, (const char *) "../../gcc/m2/mc/mcMetaError.mod", 31, 109);
}
return a;
/* static analysis guarentees a RETURN statement will be used before here. */
@ -734,7 +734,7 @@ static mcError_error doError (mcError_error e, mcMetaError_errorType t, unsigned
case mcMetaError_chained:
if (e == NULL)
{
mcError_internalError ((const char *) "should not be chaining an error onto an empty error note", 56, (const char *) "../../gcc-read-write/gcc/m2/mc/mcMetaError.mod", 46, 355);
mcError_internalError ((const char *) "should not be chaining an error onto an empty error note", 56, (const char *) "../../gcc/m2/mc/mcMetaError.mod", 31, 355);
}
else
{
@ -758,7 +758,7 @@ static mcError_error doError (mcError_error e, mcMetaError_errorType t, unsigned
default:
mcError_internalError ((const char *) "unexpected enumeration value", 28, (const char *) "../../gcc-read-write/gcc/m2/mc/mcMetaError.mod", 46, 369);
mcError_internalError ((const char *) "unexpected enumeration value", 28, (const char *) "../../gcc/m2/mc/mcMetaError.mod", 31, 369);
break;
}
return e;

4
gcc/m2/mc-boot/GmcStack.c
View file

@ -165,7 +165,7 @@ extern "C" void * mcStack_pop (mcStack_stack s)
Indexing_DeleteIndice (s->list, Indexing_HighIndice (s->list));
return a;
}
ReturnException ("../../gcc-read-write/gcc/m2/mc/mcStack.def", 20, 1);
ReturnException ("../../gcc/m2/mc/mcStack.def", 20, 1);
__builtin_unreachable ();
}
@ -215,7 +215,7 @@ extern "C" void * mcStack_access (mcStack_stack s, unsigned int i)
{
return Indexing_GetIndice (s->list, i);
}
ReturnException ("../../gcc-read-write/gcc/m2/mc/mcStack.def", 20, 1);
ReturnException ("../../gcc/m2/mc/mcStack.def", 20, 1);
__builtin_unreachable ();
}

4
gcc/m2/mc-boot/GnameKey.c
View file

@ -323,7 +323,7 @@ extern "C" nameKey_Name nameKey_makeKey (const char *a_, unsigned int _a_high)
(*p) = ASCII_nul;
return doMakeKey (n, higha);
}
ReturnException ("../../gcc-read-write/gcc/m2/mc/nameKey.def", 20, 1);
ReturnException ("../../gcc/m2/mc/nameKey.def", 20, 1);
__builtin_unreachable ();
}
@ -373,7 +373,7 @@ extern "C" nameKey_Name nameKey_makekey (void * a)
return doMakeKey (n, higha);
}
}
ReturnException ("../../gcc-read-write/gcc/m2/mc/nameKey.def", 20, 1);
ReturnException ("../../gcc/m2/mc/nameKey.def", 20, 1);
__builtin_unreachable ();
}

43
gcc/m2/mc-boot/Gpth.h
View file

@ -1,43 +0,0 @@
#if !defined (_pth_H)
# define _pth_H
# ifdef __cplusplus
extern "C" {
# endif
# if !defined (PROC_D)
# define PROC_D
typedef void (*PROC_t) (void);
typedef struct { PROC_t proc; } PROC;
# endif
# include "GSYSTEM.h"
# if defined (_pth_C)
# define EXTERN
# else
# define EXTERN extern
# endif
typedef struct pth_proc_p pth_proc;
typedef unsigned int pth_size_t;
typedef void *pth_pth_uctx_t;
typedef void (*pth_proc_t) (void *);
struct pth_proc_p { pth_proc_t proc; };
EXTERN int pth_pth_select (int p1, void * p2, void * p3, void * p4, void * p5);
EXTERN int pth_pth_uctx_create (void * p);
EXTERN int pth_pth_uctx_make (pth_pth_uctx_t p1, void * p2, pth_size_t p3, void * p4, pth_proc p5, void * p6, pth_pth_uctx_t p7);
EXTERN int pth_pth_uctx_save (pth_pth_uctx_t p1);
EXTERN int pth_pth_uctx_switch (pth_pth_uctx_t p1, pth_pth_uctx_t p2);
EXTERN int pth_pth_init (void);
# ifdef __cplusplus
}
# endif
# undef EXTERN
#endif

6
gcc/m2/mc-boot/GsymbolKey.c
View file

@ -142,7 +142,7 @@ static void findNodeAndParentInTree (symbolKey_symbolTree t, nameKey_Name n, sym
(*father) = t;
if (t == NULL)
{
Debug_Halt ((const char *) "parameter t should never be NIL", 31, 203, (const char *) "../../gcc-read-write/gcc/m2/mc/symbolKey.mod", 44);
Debug_Halt ((const char *) "parameter t should never be NIL", 31, 203, (const char *) "../../gcc/m2/mc/symbolKey.mod", 29);
}
(*child) = t->left;
if ((*child) != NULL)
@ -285,7 +285,7 @@ extern "C" void symbolKey_putSymKey (symbolKey_symbolTree t, nameKey_Name name,
}
else
{
Debug_Halt ((const char *) "symbol already stored", 21, 119, (const char *) "../../gcc-read-write/gcc/m2/mc/symbolKey.mod", 44);
Debug_Halt ((const char *) "symbol already stored", 21, 119, (const char *) "../../gcc/m2/mc/symbolKey.mod", 29);
}
}
@ -352,7 +352,7 @@ extern "C" void symbolKey_delSymKey (symbolKey_symbolTree t, nameKey_Name name)
}
else
{
Debug_Halt ((const char *) "trying to delete a symbol that is not in the tree - the compiler never expects this to occur", 92, 186, (const char *) "../../gcc-read-write/gcc/m2/mc/symbolKey.mod", 44);
Debug_Halt ((const char *) "trying to delete a symbol that is not in the tree - the compiler never expects this to occur", 92, 186, (const char *) "../../gcc/m2/mc/symbolKey.mod", 29);
}
}

2
gcc/m2/pge-boot/GASCII.c
View file

@ -79,6 +79,6 @@ extern "C" void _M2_ASCII_init (__attribute__((unused)) int argc,__attribute__((
{
}
extern "C" void _M2_ASCII_finish (__attribute__((unused)) int argc,__attribute__((unused)) char *argv[],__attribute__((unused)) char *envp[])
extern "C" void _M2_ASCII_fini (__attribute__((unused)) int argc,__attribute__((unused)) char *argv[],__attribute__((unused)) char *envp[])
{
}

2
gcc/m2/pge-boot/GArgs.c
View file

@ -113,6 +113,6 @@ extern "C" void _M2_Args_init (__attribute__((unused)) int argc,__attribute__((u
{
}
extern "C" void _M2_Args_finish (__attribute__((unused)) int argc,__attribute__((unused)) char *argv[],__attribute__((unused)) char *envp[])
extern "C" void _M2_Args_fini (__attribute__((unused)) int argc,__attribute__((unused)) char *argv[],__attribute__((unused)) char *envp[])
{
}

2
gcc/m2/pge-boot/GAssertion.c
View file

@ -64,6 +64,6 @@ extern "C" void _M2_Assertion_init (__attribute__((unused)) int argc,__attribute
{
}
extern "C" void _M2_Assertion_finish (__attribute__((unused)) int argc,__attribute__((unused)) char *argv[],__attribute__((unused)) char *envp[])
extern "C" void _M2_Assertion_fini (__attribute__((unused)) int argc,__attribute__((unused)) char *argv[],__attribute__((unused)) char *envp[])
{
}

2
gcc/m2/pge-boot/GDebug.c
View file

@ -163,6 +163,6 @@ extern "C" void _M2_Debug_init (__attribute__((unused)) int argc,__attribute__((
{
}
extern "C" void _M2_Debug_finish (__attribute__((unused)) int argc,__attribute__((unused)) char *argv[],__attribute__((unused)) char *envp[])
extern "C" void _M2_Debug_fini (__attribute__((unused)) int argc,__attribute__((unused)) char *argv[],__attribute__((unused)) char *envp[])
{
}

34
gcc/m2/pge-boot/GDynamicStrings.c
View file

@ -1217,7 +1217,7 @@ static void ConcatContents (DynamicStrings_Contents *c, const char *a_, unsigned
(*c).next->contents.next = NULL;
ConcatContents (&(*c).next->contents, (const char *) a, _a_high, h, o);
AddDebugInfo ((*c).next);
(*c).next = AssignDebug ((*c).next, (const char *) "../../gcc-read-write/gcc/m2/gm2-libs/DynamicStrings.mod", 55, 722, (const char *) "ConcatContents", 14);
(*c).next = AssignDebug ((*c).next, (const char *) "../../gcc/m2/gm2-libs/DynamicStrings.mod", 40, 722, (const char *) "ConcatContents", 14);
}
else
{
@ -1315,7 +1315,7 @@ static void ConcatContentsAddress (DynamicStrings_Contents *c, void * a, unsigne
AddDebugInfo ((*c).next);
if (TraceOn)
{
(*c).next = AssignDebug ((*c).next, (const char *) "../../gcc-read-write/gcc/m2/gm2-libs/DynamicStrings.mod", 55, 917, (const char *) "ConcatContentsAddress", 21);
(*c).next = AssignDebug ((*c).next, (const char *) "../../gcc/m2/gm2-libs/DynamicStrings.mod", 40, 917, (const char *) "ConcatContentsAddress", 21);
}
}
else
@ -1540,7 +1540,7 @@ extern "C" DynamicStrings_String DynamicStrings_InitString (const char *a_, unsi
AddDebugInfo (s);
if (TraceOn)
{
s = AssignDebug (s, (const char *) "../../gcc-read-write/gcc/m2/gm2-libs/DynamicStrings.mod", 55, 758, (const char *) "InitString", 10);
s = AssignDebug (s, (const char *) "../../gcc/m2/gm2-libs/DynamicStrings.mod", 40, 758, (const char *) "InitString", 10);
}
return s;
/* static analysis guarentees a RETURN statement will be used before here. */
@ -1643,7 +1643,7 @@ extern "C" DynamicStrings_String DynamicStrings_InitStringCharStar (void * a)
AddDebugInfo (s);
if (TraceOn)
{
s = AssignDebug (s, (const char *) "../../gcc-read-write/gcc/m2/gm2-libs/DynamicStrings.mod", 55, 957, (const char *) "InitStringCharStar", 18);
s = AssignDebug (s, (const char *) "../../gcc/m2/gm2-libs/DynamicStrings.mod", 40, 957, (const char *) "InitStringCharStar", 18);
}
return s;
/* static analysis guarentees a RETURN statement will be used before here. */
@ -1668,7 +1668,7 @@ extern "C" DynamicStrings_String DynamicStrings_InitStringChar (char ch)
s = DynamicStrings_InitString ((const char *) &a.array[0], 1);
if (TraceOn)
{
s = AssignDebug (s, (const char *) "../../gcc-read-write/gcc/m2/gm2-libs/DynamicStrings.mod", 55, 977, (const char *) "InitStringChar", 14);
s = AssignDebug (s, (const char *) "../../gcc/m2/gm2-libs/DynamicStrings.mod", 40, 977, (const char *) "InitStringChar", 14);
}
return s;
/* static analysis guarentees a RETURN statement will be used before here. */
@ -1826,7 +1826,7 @@ extern "C" DynamicStrings_String DynamicStrings_Dup (DynamicStrings_String s)
s = DynamicStrings_Assign (DynamicStrings_InitString ((const char *) "", 0), s);
if (TraceOn)
{
s = AssignDebug (s, (const char *) "../../gcc-read-write/gcc/m2/gm2-libs/DynamicStrings.mod", 55, 1173, (const char *) "Dup", 3);
s = AssignDebug (s, (const char *) "../../gcc/m2/gm2-libs/DynamicStrings.mod", 40, 1173, (const char *) "Dup", 3);
}
return s;
/* static analysis guarentees a RETURN statement will be used before here. */
@ -1848,7 +1848,7 @@ extern "C" DynamicStrings_String DynamicStrings_Add (DynamicStrings_String a, Dy
a = DynamicStrings_ConCat (DynamicStrings_ConCat (DynamicStrings_InitString ((const char *) "", 0), a), b);
if (TraceOn)
{
a = AssignDebug (a, (const char *) "../../gcc-read-write/gcc/m2/gm2-libs/DynamicStrings.mod", 55, 1193, (const char *) "Add", 3);
a = AssignDebug (a, (const char *) "../../gcc/m2/gm2-libs/DynamicStrings.mod", 40, 1193, (const char *) "Add", 3);
}
return a;
/* static analysis guarentees a RETURN statement will be used before here. */
@ -1913,7 +1913,7 @@ extern "C" unsigned int DynamicStrings_EqualCharStar (DynamicStrings_String s, v
t = DynamicStrings_InitStringCharStar (a);
if (TraceOn)
{
t = AssignDebug (t, (const char *) "../../gcc-read-write/gcc/m2/gm2-libs/DynamicStrings.mod", 55, 1250, (const char *) "EqualCharStar", 13);
t = AssignDebug (t, (const char *) "../../gcc/m2/gm2-libs/DynamicStrings.mod", 40, 1250, (const char *) "EqualCharStar", 13);
}
t = AddToGarbage (t, s);
if (DynamicStrings_Equal (t, s))
@ -1951,7 +1951,7 @@ extern "C" unsigned int DynamicStrings_EqualArray (DynamicStrings_String s, cons
t = DynamicStrings_InitString ((const char *) a, _a_high);
if (TraceOn)
{
t = AssignDebug (t, (const char *) "../../gcc-read-write/gcc/m2/gm2-libs/DynamicStrings.mod", 55, 1280, (const char *) "EqualArray", 10);
t = AssignDebug (t, (const char *) "../../gcc/m2/gm2-libs/DynamicStrings.mod", 40, 1280, (const char *) "EqualArray", 10);
}
t = AddToGarbage (t, s);
if (DynamicStrings_Equal (t, s))
@ -1989,7 +1989,7 @@ extern "C" DynamicStrings_String DynamicStrings_Mult (DynamicStrings_String s, u
}
if (TraceOn)
{
s = AssignDebug (s, (const char *) "../../gcc-read-write/gcc/m2/gm2-libs/DynamicStrings.mod", 55, 1312, (const char *) "Mult", 4);
s = AssignDebug (s, (const char *) "../../gcc/m2/gm2-libs/DynamicStrings.mod", 40, 1312, (const char *) "Mult", 4);
}
return s;
/* static analysis guarentees a RETURN statement will be used before here. */
@ -2068,7 +2068,7 @@ extern "C" DynamicStrings_String DynamicStrings_Slice (DynamicStrings_String s,
AddDebugInfo (t->contents.next);
if (TraceOn)
{
t->contents.next = AssignDebug (t->contents.next, (const char *) "../../gcc-read-write/gcc/m2/gm2-libs/DynamicStrings.mod", 55, 1380, (const char *) "Slice", 5);
t->contents.next = AssignDebug (t->contents.next, (const char *) "../../gcc/m2/gm2-libs/DynamicStrings.mod", 40, 1380, (const char *) "Slice", 5);
}
}
t = t->contents.next;
@ -2086,7 +2086,7 @@ extern "C" DynamicStrings_String DynamicStrings_Slice (DynamicStrings_String s,
}
if (TraceOn)
{
d = AssignDebug (d, (const char *) "../../gcc-read-write/gcc/m2/gm2-libs/DynamicStrings.mod", 55, 1397, (const char *) "Slice", 5);
d = AssignDebug (d, (const char *) "../../gcc/m2/gm2-libs/DynamicStrings.mod", 40, 1397, (const char *) "Slice", 5);
}
return d;
/* static analysis guarentees a RETURN statement will be used before here. */
@ -2214,7 +2214,7 @@ extern "C" DynamicStrings_String DynamicStrings_RemoveComment (DynamicStrings_St
}
if (TraceOn)
{
s = AssignDebug (s, (const char *) "../../gcc-read-write/gcc/m2/gm2-libs/DynamicStrings.mod", 55, 1509, (const char *) "RemoveComment", 13);
s = AssignDebug (s, (const char *) "../../gcc/m2/gm2-libs/DynamicStrings.mod", 40, 1509, (const char *) "RemoveComment", 13);
}
return s;
/* static analysis guarentees a RETURN statement will be used before here. */
@ -2239,7 +2239,7 @@ extern "C" DynamicStrings_String DynamicStrings_RemoveWhitePrefix (DynamicString
s = DynamicStrings_Slice (s, (int ) (i), 0);
if (TraceOn)
{
s = AssignDebug (s, (const char *) "../../gcc-read-write/gcc/m2/gm2-libs/DynamicStrings.mod", 55, 1621, (const char *) "RemoveWhitePrefix", 17);
s = AssignDebug (s, (const char *) "../../gcc/m2/gm2-libs/DynamicStrings.mod", 40, 1621, (const char *) "RemoveWhitePrefix", 17);
}
return s;
/* static analysis guarentees a RETURN statement will be used before here. */
@ -2264,7 +2264,7 @@ extern "C" DynamicStrings_String DynamicStrings_RemoveWhitePostfix (DynamicStrin
s = DynamicStrings_Slice (s, 0, i+1);
if (TraceOn)
{
s = AssignDebug (s, (const char *) "../../gcc-read-write/gcc/m2/gm2-libs/DynamicStrings.mod", 55, 1643, (const char *) "RemoveWhitePostfix", 18);
s = AssignDebug (s, (const char *) "../../gcc/m2/gm2-libs/DynamicStrings.mod", 40, 1643, (const char *) "RemoveWhitePostfix", 18);
}
return s;
/* static analysis guarentees a RETURN statement will be used before here. */
@ -2633,7 +2633,7 @@ extern "C" DynamicStrings_String DynamicStrings_PopAllocationExemption (unsigned
{
stop ();
/* writeString ("mismatched number of PopAllocation's compared to PushAllocation's") */
M2RTS_Halt ((const char *) "../../gcc-read-write/gcc/m2/gm2-libs/DynamicStrings.mod", 55, 176, (const char *) "PopAllocationExemption", 22, (const char *) "mismatched number of PopAllocation's compared to PushAllocation's", 65);
M2RTS_Halt ((const char *) "../../gcc/m2/gm2-libs/DynamicStrings.mod", 40, 176, (const char *) "PopAllocationExemption", 22, (const char *) "mismatched number of PopAllocation's compared to PushAllocation's", 65);
}
else
{
@ -2674,6 +2674,6 @@ extern "C" void _M2_DynamicStrings_init (__attribute__((unused)) int argc,__attr
Init ();
}
extern "C" void _M2_DynamicStrings_finish (__attribute__((unused)) int argc,__attribute__((unused)) char *argv[],__attribute__((unused)) char *envp[])
extern "C" void _M2_DynamicStrings_fini (__attribute__((unused)) int argc,__attribute__((unused)) char *argv[],__attribute__((unused)) char *envp[])
{
}

22
gcc/m2/pge-boot/GFIO.c
View file

@ -558,7 +558,7 @@ static FIO_File GetNextFreeDescriptor (void)
return f; /* create new slot */
}
}
ReturnException ("../../gcc-read-write/gcc/m2/gm2-libs/FIO.def", 25, 1);
ReturnException ("../../gcc/m2/gm2-libs/FIO.def", 25, 1);
__builtin_unreachable ();
}
@ -729,7 +729,7 @@ static int ReadFromBuffer (FIO_File f, void * a, unsigned int nBytes)
(*p) = static_cast<unsigned char> ((*fd->buffer->contents).array[fd->buffer->position]);
fd->buffer->left -= 1; /* remove consumed bytes */
fd->buffer->position += 1; /* move onwards n bytes */
nBytes = 0; /* reduce the amount for future direct */
nBytes = 0;
/* read */
return 1;
}
@ -824,7 +824,6 @@ static int BufferedRead (FIO_File f, unsigned int nBytes, void * a)
if (f != Error)
{
/* avoid dangling else. */
fd = static_cast<FIO_FileDescriptor> (Indexing_GetIndice (FileInfo, f));
total = 0; /* how many bytes have we read */
if (fd != NULL) /* how many bytes have we read */
@ -894,16 +893,9 @@ static int BufferedRead (FIO_File f, unsigned int nBytes, void * a)
}
return total;
}
else
{
return -1;
}
}
}
else
{
return -1;
}
return -1;
/* static analysis guarentees a RETURN statement will be used before here. */
__builtin_unreachable ();
}
@ -2269,7 +2261,8 @@ extern "C" void * FIO_getFileName (FIO_File f)
return fd->name.address;
}
}
ReturnException ("../../gcc-read-write/gcc/m2/gm2-libs/FIO.def", 25, 1);
return NULL;
/* static analysis guarentees a RETURN statement will be used before here. */
__builtin_unreachable ();
}
@ -2296,7 +2289,8 @@ extern "C" unsigned int FIO_getFileNameLength (FIO_File f)
return fd->name.size;
}
}
ReturnException ("../../gcc-read-write/gcc/m2/gm2-libs/FIO.def", 25, 1);
return 0;
/* static analysis guarentees a RETURN statement will be used before here. */
__builtin_unreachable ();
}
@ -2325,7 +2319,7 @@ extern "C" void _M2_FIO_init (__attribute__((unused)) int argc,__attribute__((un
Init ();
}
extern "C" void _M2_FIO_finish (__attribute__((unused)) int argc,__attribute__((unused)) char *argv[],__attribute__((unused)) char *envp[])
extern "C" void _M2_FIO_fini (__attribute__((unused)) int argc,__attribute__((unused)) char *argv[],__attribute__((unused)) char *envp[])
{
FIO_FlushOutErr ();
}

2
gcc/m2/pge-boot/GIO.c
View file

@ -474,6 +474,6 @@ extern "C" void _M2_IO_init (__attribute__((unused)) int argc,__attribute__((unu
Init ();
}
extern "C" void _M2_IO_finish (__attribute__((unused)) int argc,__attribute__((unused)) char *argv[],__attribute__((unused)) char *envp[])
extern "C" void _M2_IO_fini (__attribute__((unused)) int argc,__attribute__((unused)) char *argv[],__attribute__((unused)) char *envp[])
{
}

8
gcc/m2/pge-boot/GIndexing.c
View file

@ -227,7 +227,7 @@ extern "C" unsigned int Indexing_InBounds (Indexing_Index i, unsigned int n)
{
return (n >= i->Low) && (n <= i->High);
}
ReturnException ("../../gcc-read-write/gcc/m2/gm2-libs/Indexing.def", 25, 1);
ReturnException ("../../gcc/m2/gm2-libs/Indexing.def", 25, 1);
__builtin_unreachable ();
}
@ -247,7 +247,7 @@ extern "C" unsigned int Indexing_HighIndice (Indexing_Index i)
{
return i->High;
}
ReturnException ("../../gcc-read-write/gcc/m2/gm2-libs/Indexing.def", 25, 1);
ReturnException ("../../gcc/m2/gm2-libs/Indexing.def", 25, 1);
__builtin_unreachable ();
}
@ -267,7 +267,7 @@ extern "C" unsigned int Indexing_LowIndice (Indexing_Index i)
{
return i->Low;
}
ReturnException ("../../gcc-read-write/gcc/m2/gm2-libs/Indexing.def", 25, 1);
ReturnException ("../../gcc/m2/gm2-libs/Indexing.def", 25, 1);
__builtin_unreachable ();
}
@ -488,6 +488,6 @@ extern "C" void _M2_Indexing_init (__attribute__((unused)) int argc,__attribute_
{
}
extern "C" void _M2_Indexing_finish (__attribute__((unused)) int argc,__attribute__((unused)) char *argv[],__attribute__((unused)) char *envp[])
extern "C" void _M2_Indexing_fini (__attribute__((unused)) int argc,__attribute__((unused)) char *argv[],__attribute__((unused)) char *envp[])
{
}

2
gcc/m2/pge-boot/GLists.c
View file

@ -422,6 +422,6 @@ extern "C" void _M2_Lists_init (__attribute__((unused)) int argc,__attribute__((
{
}
extern "C" void _M2_Lists_finish (__attribute__((unused)) int argc,__attribute__((unused)) char *argv[],__attribute__((unused)) char *envp[])
extern "C" void _M2_Lists_fini (__attribute__((unused)) int argc,__attribute__((unused)) char *argv[],__attribute__((unused)) char *envp[])
{
}

454
gcc/m2/pge-boot/GM2Dependent.c
View file

@ -42,7 +42,9 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
#include <stddef.h>
#include <string.h>
#include <limits.h>
#include <stdlib.h>
# include "GStorage.h"
#include <unistd.h>
#if defined(__cplusplus)
# undef NULL
# define NULL 0
@ -84,6 +86,7 @@ struct M2Dependent_DependencyList_r {
struct M2Dependent__T3_a { M2Dependent_ModuleChain array[M2Dependent_user-M2Dependent_unregistered+1]; };
struct M2Dependent__T2_r {
void *name;
void *libname;
M2Dependent_ArgCVEnvP init;
M2Dependent_ArgCVEnvP fini;
M2Dependent_DependencyList dependency;
@ -93,7 +96,9 @@ struct M2Dependent__T2_r {
static M2Dependent__T3 Modules;
static unsigned int Initialized;
static unsigned int WarningTrace;
static unsigned int ModuleTrace;
static unsigned int HexTrace;
static unsigned int DependencyTrace;
static unsigned int PreTrace;
static unsigned int PostTrace;
@ -104,14 +109,14 @@ static unsigned int ForceTrace;
module constructor in turn.
*/
extern "C" void M2Dependent_ConstructModules (void * applicationmodule, int argc, void * argv, void * envp);
extern "C" void M2Dependent_ConstructModules (void * applicationmodule, void * libname, int argc, void * argv, void * envp);
/*
DeconstructModules - resolve dependencies and then call each
module constructor in turn.
*/
extern "C" void M2Dependent_DeconstructModules (void * applicationmodule, int argc, void * argv, void * envp);
extern "C" void M2Dependent_DeconstructModules (void * applicationmodule, void * libname, int argc, void * argv, void * envp);
/*
RegisterModule - adds module name to the list of outstanding
@ -119,7 +124,7 @@ extern "C" void M2Dependent_DeconstructModules (void * applicationmodule, int ar
explored to determine initialization order.
*/
extern "C" void M2Dependent_RegisterModule (void * name, M2Dependent_ArgCVEnvP init, M2Dependent_ArgCVEnvP fini, PROC dependencies);
extern "C" void M2Dependent_RegisterModule (void * modulename, void * libname, M2Dependent_ArgCVEnvP init, M2Dependent_ArgCVEnvP fini, PROC dependencies);
/*
RequestDependant - used to specify that modulename is dependant upon
@ -127,14 +132,14 @@ extern "C" void M2Dependent_RegisterModule (void * name, M2Dependent_ArgCVEnvP i
if we are not using StaticInitialization.
*/
extern "C" void M2Dependent_RequestDependant (void * modulename, void * dependantmodule);
extern "C" void M2Dependent_RequestDependant (void * modulename, void * libname, void * dependantmodule, void * dependantlibname);
/*
CreateModule - creates a new module entry and returns the
ModuleChain.
*/
static M2Dependent_ModuleChain CreateModule (void * name, M2Dependent_ArgCVEnvP init, M2Dependent_ArgCVEnvP fini, PROC dependencies);
static M2Dependent_ModuleChain CreateModule (void * name, void * libname, M2Dependent_ArgCVEnvP init, M2Dependent_ArgCVEnvP fini, PROC dependencies);
/*
AppendModule - append chain to end of the list.
@ -155,18 +160,30 @@ static void RemoveModule (M2Dependent_ModuleChain *head, M2Dependent_ModuleChain
static unsigned int onChain (M2Dependent_DependencyState state, M2Dependent_ModuleChain mptr);
/*
LookupModuleN - lookup module from the state list. The string is limited
to nchar.
max -
*/
static M2Dependent_ModuleChain LookupModuleN (M2Dependent_DependencyState state, void * name, unsigned int nchar);
static unsigned int max (unsigned int a, unsigned int b);
/*
min -
*/
static unsigned int min (unsigned int a, unsigned int b);
/*
LookupModuleN - lookup module from the state list.
The strings lengths are known.
*/
static M2Dependent_ModuleChain LookupModuleN (M2Dependent_DependencyState state, void * name, unsigned int namelen, void * libname, unsigned int libnamelen);
/*
LookupModule - lookup and return the ModuleChain pointer containing
module name from a particular list.
*/
static M2Dependent_ModuleChain LookupModule (M2Dependent_DependencyState state, void * name);
static M2Dependent_ModuleChain LookupModule (M2Dependent_DependencyState state, void * name, void * libname);
/*
toCString - replace any character sequence
@ -207,6 +224,12 @@ static void traceprintf (unsigned int flag, const char *str_, unsigned int _str_
static void traceprintf2 (unsigned int flag, const char *str_, unsigned int _str_high, void * arg);
/*
traceprintf3 - wrap printf with a boolean flag.
*/
static void traceprintf3 (unsigned int flag, const char *str_, unsigned int _str_high, void * arg1, void * arg2);
/*
moveTo - moves mptr to the new list determined by newstate.
It updates the mptr state appropriately.
@ -218,7 +241,7 @@ static void moveTo (M2Dependent_DependencyState newstate, M2Dependent_ModuleChai
ResolveDependant -
*/
static void ResolveDependant (M2Dependent_ModuleChain mptr, void * currentmodule);
static void ResolveDependant (M2Dependent_ModuleChain mptr, void * currentmodule, void * libname);
/*
PerformRequestDependant - the current modulename has a dependancy upon
@ -227,19 +250,19 @@ static void ResolveDependant (M2Dependent_ModuleChain mptr, void * currentmodule
resolved.
*/
static void PerformRequestDependant (void * modulename, void * dependantmodule);
static void PerformRequestDependant (void * modulename, void * libname, void * dependantmodule, void * dependantlibname);
/*
ResolveDependencies - resolve dependencies for currentmodule.
ResolveDependencies - resolve dependencies for currentmodule, libname.
*/
static void ResolveDependencies (void * currentmodule);
static void ResolveDependencies (void * currentmodule, void * libname);
/*
DisplayModuleInfo - displays all module in the state.
*/
static void DisplayModuleInfo (M2Dependent_DependencyState state, const char *name_, unsigned int _name_high);
static void DisplayModuleInfo (M2Dependent_DependencyState state, const char *desc_, unsigned int _desc_high);
/*
DumpModuleData -
@ -256,6 +279,18 @@ static void DumpModuleData (unsigned int flag);
static void combine (M2Dependent_DependencyState src, M2Dependent_DependencyState dest);
/*
tracemodule -
*/
static void tracemodule (unsigned int flag, void * modname, unsigned int modlen, void * libname, unsigned int liblen);
/*
ForceModule -
*/
static void ForceModule (void * modname, unsigned int modlen, void * libname, unsigned int liblen);
/*
ForceDependencies - if the user has specified a forced order then we override
the dynamic ordering with the preference.
@ -270,6 +305,12 @@ static void ForceDependencies (void);
static void CheckApplication (void);
/*
warning3 - write format arg1 arg2 to stderr.
*/
static void warning3 (const char *format_, unsigned int _format_high, void * arg1, void * arg2);
/*
equal - return TRUE if C string cstr is equal to str.
*/
@ -280,11 +321,12 @@ static unsigned int equal (void * cstr, const char *str_, unsigned int _str_high
SetupDebugFlags - By default assigns ModuleTrace, DependencyTrace,
DumpPostInit to FALSE. It checks the environment
GCC_M2LINK_RTFLAG which can contain
"all,module,pre,post,dep,force". all turns them all on.
"all,module,hex,pre,post,dep,force". all turns them all on.
The flag meanings are as follows and flags the are in
execution order.
module generate trace info as the modules are registered.
hex dump the modules ctor functions address in hex.
pre generate a list of all modules seen prior to having
their dependancies resolved.
dep display a trace as the modules are resolved.
@ -317,18 +359,26 @@ static void CheckInitialized (void);
ModuleChain.
*/
static M2Dependent_ModuleChain CreateModule (void * name, M2Dependent_ArgCVEnvP init, M2Dependent_ArgCVEnvP fini, PROC dependencies)
static M2Dependent_ModuleChain CreateModule (void * name, void * libname, M2Dependent_ArgCVEnvP init, M2Dependent_ArgCVEnvP fini, PROC dependencies)
{
M2Dependent_ModuleChain mptr;
void * p0;
void * p1;
Storage_ALLOCATE ((void **) &mptr, sizeof (M2Dependent__T2));
mptr->name = name;
mptr->libname = libname;
mptr->init = init;
mptr->fini = fini;
mptr->dependency.proc = dependencies;
mptr->dependency.state = M2Dependent_unregistered;
mptr->prev = NULL;
mptr->next = NULL;
if (HexTrace)
{
libc_printf ((const char *) " (init: %p fini: %p", 22, init, fini);
libc_printf ((const char *) " dep: %p)", 10, dependencies);
}
return mptr;
/* static analysis guarentees a RETURN statement will be used before here. */
__builtin_unreachable ();
@ -405,11 +455,49 @@ static unsigned int onChain (M2Dependent_DependencyState state, M2Dependent_Modu
/*
LookupModuleN - lookup module from the state list. The string is limited
to nchar.
max -
*/
static M2Dependent_ModuleChain LookupModuleN (M2Dependent_DependencyState state, void * name, unsigned int nchar)
static unsigned int max (unsigned int a, unsigned int b)
{
if (a > b)
{
return a;
}
else
{
return b;
}
/* static analysis guarentees a RETURN statement will be used before here. */
__builtin_unreachable ();
}
/*
min -
*/
static unsigned int min (unsigned int a, unsigned int b)
{
if (a < b)
{
return a;
}
else
{
return b;
}
/* static analysis guarentees a RETURN statement will be used before here. */
__builtin_unreachable ();
}
/*
LookupModuleN - lookup module from the state list.
The strings lengths are known.
*/
static M2Dependent_ModuleChain LookupModuleN (M2Dependent_DependencyState state, void * name, unsigned int namelen, void * libname, unsigned int libnamelen)
{
M2Dependent_ModuleChain ptr;
@ -417,7 +505,7 @@ static M2Dependent_ModuleChain LookupModuleN (M2Dependent_DependencyState state,
{
ptr = Modules.array[state-M2Dependent_unregistered];
do {
if ((strncmp (reinterpret_cast<M2LINK_PtrToChar> (ptr->name), reinterpret_cast<M2LINK_PtrToChar> (name), nchar)) == 0)
if (((strncmp (reinterpret_cast<M2LINK_PtrToChar> (ptr->name), reinterpret_cast<M2LINK_PtrToChar> (name), max (namelen, static_cast<unsigned int> (strlen_ (reinterpret_cast<M2LINK_PtrToChar> (ptr->name)))))) == 0) && ((strncmp (reinterpret_cast<M2LINK_PtrToChar> (ptr->libname), reinterpret_cast<M2LINK_PtrToChar> (libname), max (libnamelen, static_cast<unsigned int> (strlen_ (reinterpret_cast<M2LINK_PtrToChar> (ptr->libname)))))) == 0))
{
return ptr;
}
@ -435,9 +523,9 @@ static M2Dependent_ModuleChain LookupModuleN (M2Dependent_DependencyState state,
module name from a particular list.
*/
static M2Dependent_ModuleChain LookupModule (M2Dependent_DependencyState state, void * name)
static M2Dependent_ModuleChain LookupModule (M2Dependent_DependencyState state, void * name, void * libname)
{
return LookupModuleN (state, name, static_cast<unsigned int> (strlen_ (reinterpret_cast<M2LINK_PtrToChar> (name))));
return LookupModuleN (state, name, static_cast<unsigned int> (strlen_ (reinterpret_cast<M2LINK_PtrToChar> (name))), libname, static_cast<unsigned int> (strlen_ (reinterpret_cast<M2LINK_PtrToChar> (libname))));
/* static analysis guarentees a RETURN statement will be used before here. */
__builtin_unreachable ();
}
@ -516,9 +604,13 @@ static int strcmp (M2LINK_PtrToChar a, M2LINK_PtrToChar b)
static int strncmp (M2LINK_PtrToChar a, M2LINK_PtrToChar b, unsigned int n)
{
if (((a != NULL) && (b != NULL)) && (n > 0))
if (n == 0)
{
/* avoid gcc warning by using compound statement even if not strictly necessary. */
return 0;
}
else if ((a != NULL) && (b != NULL))
{
/* avoid dangling else. */
if (a == b)
{
return 0;
@ -595,6 +687,7 @@ static void traceprintf (unsigned int flag, const char *str_, unsigned int _str_
static void traceprintf2 (unsigned int flag, const char *str_, unsigned int _str_high, void * arg)
{
char ch;
char str[_str_high+1];
/* make a local copy of each unbounded array. */
@ -603,11 +696,46 @@ static void traceprintf2 (unsigned int flag, const char *str_, unsigned int _str
if (flag)
{
toCString ((char *) str, _str_high);
if (arg == NULL)
{
ch = (char) 0;
arg = &ch;
}
libc_printf ((const char *) str, _str_high, arg);
}
}
/*
traceprintf3 - wrap printf with a boolean flag.
*/
static void traceprintf3 (unsigned int flag, const char *str_, unsigned int _str_high, void * arg1, void * arg2)
{
char ch;
char str[_str_high+1];
/* make a local copy of each unbounded array. */
memcpy (str, str_, _str_high+1);
if (flag)
{
toCString ((char *) str, _str_high);
if (arg1 == NULL)
{
ch = (char) 0;
arg1 = &ch;
}
if (arg2 == NULL)
{
ch = (char) 0;
arg2 = &ch;
}
libc_printf ((const char *) str, _str_high, arg1, arg2);
}
}
/*
moveTo - moves mptr to the new list determined by newstate.
It updates the mptr state appropriately.
@ -628,11 +756,11 @@ static void moveTo (M2Dependent_DependencyState newstate, M2Dependent_ModuleChai
ResolveDependant -
*/
static void ResolveDependant (M2Dependent_ModuleChain mptr, void * currentmodule)
static void ResolveDependant (M2Dependent_ModuleChain mptr, void * currentmodule, void * libname)
{
if (mptr == NULL)
{
traceprintf (DependencyTrace, (const char *) " module has not been registered via a global constructor\\n", 60);
traceprintf3 (DependencyTrace, (const char *) " module %s [%s] has not been registered via a global constructor\\n", 68, currentmodule, libname);
}
else
{
@ -643,9 +771,9 @@ static void ResolveDependant (M2Dependent_ModuleChain mptr, void * currentmodule
else
{
moveTo (M2Dependent_started, mptr);
traceprintf2 (DependencyTrace, (const char *) " starting: %s\\n", 17, currentmodule);
traceprintf3 (DependencyTrace, (const char *) " starting: %s [%s]\\n", 22, currentmodule, libname);
(*mptr->dependency.proc.proc) (); /* Invoke and process the dependency graph. */
traceprintf2 (DependencyTrace, (const char *) " finished: %s\\n", 17, currentmodule); /* Invoke and process the dependency graph. */
traceprintf3 (DependencyTrace, (const char *) " finished: %s [%s]\\n", 22, currentmodule, libname); /* Invoke and process the dependency graph. */
moveTo (M2Dependent_ordered, mptr);
}
}
@ -659,73 +787,73 @@ static void ResolveDependant (M2Dependent_ModuleChain mptr, void * currentmodule
resolved.
*/
static void PerformRequestDependant (void * modulename, void * dependantmodule)
static void PerformRequestDependant (void * modulename, void * libname, void * dependantmodule, void * dependantlibname)
{
M2Dependent_ModuleChain mptr;
traceprintf2 (DependencyTrace, (const char *) " module %s", 11, modulename);
traceprintf3 (DependencyTrace, (const char *) " module %s [%s]", 16, modulename, libname);
if (dependantmodule == NULL)
{
/* avoid dangling else. */
traceprintf2 (DependencyTrace, (const char *) " has finished its import graph\\n", 32, modulename);
mptr = LookupModule (M2Dependent_unordered, modulename);
traceprintf (DependencyTrace, (const char *) " has finished its import graph\\n", 32);
mptr = LookupModule (M2Dependent_unordered, modulename, libname);
if (mptr != NULL)
{
traceprintf2 (DependencyTrace, (const char *) " module %s is now ordered\\n", 28, modulename);
traceprintf3 (DependencyTrace, (const char *) " module %s [%s] is now ordered\\n", 33, modulename, libname);
moveTo (M2Dependent_ordered, mptr);
}
}
else
{
traceprintf2 (DependencyTrace, (const char *) " imports from %s\\n", 18, dependantmodule);
mptr = LookupModule (M2Dependent_ordered, dependantmodule);
traceprintf3 (DependencyTrace, (const char *) " imports from %s [%s]\\n", 23, dependantmodule, dependantlibname);
mptr = LookupModule (M2Dependent_ordered, dependantmodule, dependantlibname);
if (mptr == NULL)
{
traceprintf2 (DependencyTrace, (const char *) " module %s is not ordered\\n", 28, dependantmodule);
mptr = LookupModule (M2Dependent_unordered, dependantmodule);
traceprintf3 (DependencyTrace, (const char *) " module %s [%s] is not ordered\\n", 33, dependantmodule, dependantlibname);
mptr = LookupModule (M2Dependent_unordered, dependantmodule, dependantlibname);
if (mptr == NULL)
{
traceprintf2 (DependencyTrace, (const char *) " module %s is not unordered\\n", 30, dependantmodule);
mptr = LookupModule (M2Dependent_started, dependantmodule);
traceprintf3 (DependencyTrace, (const char *) " module %s [%s] is not unordered\\n", 35, dependantmodule, dependantlibname);
mptr = LookupModule (M2Dependent_started, dependantmodule, dependantlibname);
if (mptr == NULL)
{
traceprintf2 (DependencyTrace, (const char *) " module %s has not started\\n", 29, dependantmodule);
traceprintf2 (DependencyTrace, (const char *) " module %s attempting to import from", 37, modulename);
traceprintf2 (DependencyTrace, (const char *) " %s which has not registered itself via a constructor\\n", 55, dependantmodule);
traceprintf3 (DependencyTrace, (const char *) " module %s [%s] has not started\\n", 34, dependantmodule, dependantlibname);
traceprintf3 (DependencyTrace, (const char *) " module %s [%s] attempting to import from", 42, modulename, libname);
traceprintf3 (DependencyTrace, (const char *) " %s [%s] which has not registered itself via a constructor\\n", 60, dependantmodule, dependantlibname);
}
else
{
traceprintf2 (DependencyTrace, (const char *) " module %s has registered itself and has started\\n", 51, dependantmodule);
traceprintf3 (DependencyTrace, (const char *) " module %s [%s] has registered itself and has started\\n", 56, dependantmodule, dependantlibname);
}
}
else
{
traceprintf2 (DependencyTrace, (const char *) " module %s resolving\\n", 23, dependantmodule);
ResolveDependant (mptr, dependantmodule);
traceprintf3 (DependencyTrace, (const char *) " module %s [%s] resolving\\n", 28, dependantmodule, dependantlibname);
ResolveDependant (mptr, dependantmodule, dependantlibname);
}
}
else
{
traceprintf2 (DependencyTrace, (const char *) " module %s ", 12, modulename);
traceprintf2 (DependencyTrace, (const char *) " dependant %s is ordered\\n", 26, dependantmodule);
traceprintf3 (DependencyTrace, (const char *) " module %s [%s]", 16, modulename, libname);
traceprintf3 (DependencyTrace, (const char *) " dependant %s [%s] is ordered\\n", 31, dependantmodule, dependantlibname);
}
}
}
/*
ResolveDependencies - resolve dependencies for currentmodule.
ResolveDependencies - resolve dependencies for currentmodule, libname.
*/
static void ResolveDependencies (void * currentmodule)
static void ResolveDependencies (void * currentmodule, void * libname)
{
M2Dependent_ModuleChain mptr;
mptr = LookupModule (M2Dependent_unordered, currentmodule);
mptr = LookupModule (M2Dependent_unordered, currentmodule, libname);
while (mptr != NULL)
{
traceprintf2 (DependencyTrace, (const char *) " attempting to resolve the dependants for %s\\n", 48, currentmodule);
ResolveDependant (mptr, currentmodule);
traceprintf3 (DependencyTrace, (const char *) " attempting to resolve the dependants for %s [%s]\\n", 53, currentmodule, libname);
ResolveDependant (mptr, currentmodule, libname);
mptr = Modules.array[M2Dependent_unordered-M2Dependent_unregistered];
}
}
@ -735,22 +863,29 @@ static void ResolveDependencies (void * currentmodule)
DisplayModuleInfo - displays all module in the state.
*/
static void DisplayModuleInfo (M2Dependent_DependencyState state, const char *name_, unsigned int _name_high)
static void DisplayModuleInfo (M2Dependent_DependencyState state, const char *desc_, unsigned int _desc_high)
{
M2Dependent_ModuleChain mptr;
unsigned int count;
char name[_name_high+1];
char desc[_desc_high+1];
/* make a local copy of each unbounded array. */
memcpy (name, name_, _name_high+1);
memcpy (desc, desc_, _desc_high+1);
if (Modules.array[state-M2Dependent_unregistered] != NULL)
{
libc_printf ((const char *) "%s modules\\n", 12, &name);
libc_printf ((const char *) "%s modules\\n", 12, &desc);
mptr = Modules.array[state-M2Dependent_unregistered];
count = 0;
do {
libc_printf ((const char *) " %d %s", 8, count, mptr->name);
if (mptr->name == NULL)
{
libc_printf ((const char *) " %d %s []", 11, count, mptr->name);
}
else
{
libc_printf ((const char *) " %d %s [%s]", 13, count, mptr->name, mptr->libname);
}
count += 1;
if (mptr->dependency.appl)
{
@ -809,6 +944,52 @@ static void combine (M2Dependent_DependencyState src, M2Dependent_DependencyStat
}
/*
tracemodule -
*/
static void tracemodule (unsigned int flag, void * modname, unsigned int modlen, void * libname, unsigned int liblen)
{
typedef struct tracemodule__T4_a tracemodule__T4;
struct tracemodule__T4_a { char array[100+1]; };
tracemodule__T4 buffer;
unsigned int len;
if (flag)
{
len = min (modlen, sizeof (buffer)-1);
libc_strncpy (&buffer, modname, len);
buffer.array[len] = (char) 0;
libc_printf ((const char *) "%s ", 3, &buffer);
len = min (liblen, sizeof (buffer)-1);
libc_strncpy (&buffer, libname, len);
buffer.array[len] = (char) 0;
libc_printf ((const char *) " [%s]", 5, &buffer);
}
}
/*
ForceModule -
*/
static void ForceModule (void * modname, unsigned int modlen, void * libname, unsigned int liblen)
{
M2Dependent_ModuleChain mptr;
traceprintf (ForceTrace, (const char *) "forcing module: ", 16);
tracemodule (ForceTrace, modname, modlen, libname, liblen);
traceprintf (ForceTrace, (const char *) "\\n", 2);
mptr = LookupModuleN (M2Dependent_ordered, modname, modlen, libname, liblen);
if (mptr != NULL)
{
mptr->dependency.forced = TRUE;
moveTo (M2Dependent_user, mptr);
}
}
/*
ForceDependencies - if the user has specified a forced order then we override
the dynamic ordering with the preference.
@ -816,46 +997,58 @@ static void combine (M2Dependent_DependencyState src, M2Dependent_DependencyStat
static void ForceDependencies (void)
{
M2Dependent_ModuleChain mptr;
M2Dependent_ModuleChain userChain;
unsigned int count;
unsigned int len;
unsigned int modlen;
unsigned int liblen;
M2LINK_PtrToChar modname;
M2LINK_PtrToChar libname;
M2LINK_PtrToChar pc;
M2LINK_PtrToChar start;
if (M2LINK_ForcedModuleInitOrder != NULL)
{
userChain = NULL;
traceprintf2 (ForceTrace, (const char *) "user forcing order: %s\\n", 24, reinterpret_cast<void *> (M2LINK_ForcedModuleInitOrder));
pc = M2LINK_ForcedModuleInitOrder;
start = pc;
count = 0;
len = 0;
modname = NULL;
modlen = 0;
libname = NULL;
liblen = 0;
while ((*pc) != ASCII_nul)
{
if ((*pc) == ',')
switch ((*pc))
{
mptr = LookupModuleN (M2Dependent_ordered, reinterpret_cast<void *> (start), count);
if (mptr != NULL)
{
mptr->dependency.forced = TRUE;
moveTo (M2Dependent_user, mptr);
}
pc += 1;
start = pc;
count = 0;
}
else
{
pc += 1;
count += 1;
case ':':
libname = start;
liblen = len;
len = 0;
pc += 1;
start = pc;
break;
case ',':
modname = start;
modlen = len;
ForceModule (reinterpret_cast<void *> (modname), modlen, reinterpret_cast<void *> (libname), liblen);
libname = NULL;
liblen = 0;
modlen = 0;
len = 0;
pc += 1;
start = pc;
break;
default:
pc += 1;
len += 1;
break;
}
}
if (start != pc)
{
mptr = LookupModuleN (M2Dependent_ordered, reinterpret_cast<void *> (start), count);
if (mptr != NULL)
{
mptr->dependency.forced = TRUE;
moveTo (M2Dependent_user, mptr);
}
ForceModule (reinterpret_cast<void *> (start), len, reinterpret_cast<void *> (libname), liblen);
}
combine (M2Dependent_user, M2Dependent_ordered);
}
@ -888,12 +1081,39 @@ static void CheckApplication (void)
} while (! ((appl != NULL) || (mptr == Modules.array[M2Dependent_ordered-M2Dependent_unregistered])));
if (appl != NULL)
{
Modules.array[M2Dependent_ordered-M2Dependent_unregistered] = appl->next;
RemoveModule (&Modules.array[M2Dependent_ordered-M2Dependent_unregistered], appl);
AppendModule (&Modules.array[M2Dependent_ordered-M2Dependent_unregistered], appl);
}
}
}
/*
warning3 - write format arg1 arg2 to stderr.
*/
static void warning3 (const char *format_, unsigned int _format_high, void * arg1, void * arg2)
{
typedef struct warning3__T5_a warning3__T5;
struct warning3__T5_a { char array[4096+1]; };
warning3__T5 buffer;
int len;
char format[_format_high+1];
/* make a local copy of each unbounded array. */
memcpy (format, format_, _format_high+1);
if (WarningTrace)
{
len = libc_snprintf (&buffer, static_cast<size_t> (sizeof (buffer)), (const char *) "warning: ", 9);
libc_write (2, &buffer, static_cast<size_t> (len));
len = libc_snprintf (&buffer, static_cast<size_t> (sizeof (buffer)), (const char *) format, _format_high, arg1, arg2);
libc_write (2, &buffer, static_cast<size_t> (len));
}
}
/*
equal - return TRUE if C string cstr is equal to str.
*/
@ -915,11 +1135,12 @@ static unsigned int equal (void * cstr, const char *str_, unsigned int _str_high
SetupDebugFlags - By default assigns ModuleTrace, DependencyTrace,
DumpPostInit to FALSE. It checks the environment
GCC_M2LINK_RTFLAG which can contain
"all,module,pre,post,dep,force". all turns them all on.
"all,module,hex,pre,post,dep,force". all turns them all on.
The flag meanings are as follows and flags the are in
execution order.
module generate trace info as the modules are registered.
hex dump the modules ctor functions address in hex.
pre generate a list of all modules seen prior to having
their dependancies resolved.
dep display a trace as the modules are resolved.
@ -940,6 +1161,8 @@ static void SetupDebugFlags (void)
PostTrace = FALSE;
PreTrace = FALSE;
ForceTrace = FALSE;
HexTrace = FALSE;
WarningTrace = FALSE;
pc = static_cast<SetupDebugFlags__T1> (libc_getenv (const_cast<void*> (reinterpret_cast<const void*>("GCC_M2LINK_RTFLAG"))));
while ((pc != NULL) && ((*pc) != ASCII_nul))
{
@ -950,6 +1173,8 @@ static void SetupDebugFlags (void)
PreTrace = TRUE;
PostTrace = TRUE;
ForceTrace = TRUE;
HexTrace = TRUE;
WarningTrace = TRUE;
pc += 3;
}
else if (equal (reinterpret_cast<void *> (pc), (const char *) "module", 6))
@ -958,6 +1183,18 @@ static void SetupDebugFlags (void)
ModuleTrace = TRUE;
pc += 6;
}
else if (equal (reinterpret_cast<void *> (pc), (const char *) "warning", 7))
{
/* avoid dangling else. */
WarningTrace = TRUE;
pc += 7;
}
else if (equal (reinterpret_cast<void *> (pc), (const char *) "hex", 3))
{
/* avoid dangling else. */
HexTrace = TRUE;
pc += 3;
}
else if (equal (reinterpret_cast<void *> (pc), (const char *) "dep", 3))
{
/* avoid dangling else. */
@ -1029,21 +1266,21 @@ static void CheckInitialized (void)
module constructor in turn.
*/
extern "C" void M2Dependent_ConstructModules (void * applicationmodule, int argc, void * argv, void * envp)
extern "C" void M2Dependent_ConstructModules (void * applicationmodule, void * libname, int argc, void * argv, void * envp)
{
M2Dependent_ModuleChain mptr;
M2Dependent_ArgCVEnvP nulp;
CheckInitialized ();
traceprintf2 (ModuleTrace, (const char *) "application module: %s\\n", 24, applicationmodule);
mptr = LookupModule (M2Dependent_unordered, applicationmodule);
traceprintf3 (ModuleTrace, (const char *) "application module: %s [%s]\\n", 29, applicationmodule, libname);
mptr = LookupModule (M2Dependent_unordered, applicationmodule, libname);
if (mptr != NULL)
{
mptr->dependency.appl = TRUE;
}
traceprintf (PreTrace, (const char *) "Pre resolving dependents\\n", 26);
DumpModuleData (PreTrace);
ResolveDependencies (applicationmodule);
ResolveDependencies (applicationmodule, libname);
traceprintf (PreTrace, (const char *) "Post resolving dependents\\n", 27);
DumpModuleData (PostTrace);
ForceDependencies ();
@ -1054,7 +1291,7 @@ extern "C" void M2Dependent_ConstructModules (void * applicationmodule, int argc
DumpModuleData (ForceTrace);
if (Modules.array[M2Dependent_ordered-M2Dependent_unregistered] == NULL)
{
traceprintf2 (ModuleTrace, (const char *) " module: %s has not registered itself using a global constructor\\n", 67, applicationmodule);
traceprintf3 (ModuleTrace, (const char *) " module: %s [%s] has not registered itself using a global constructor\\n", 72, applicationmodule, libname);
traceprintf2 (ModuleTrace, (const char *) " hint try compile and linking using: gm2 %s.mod\\n", 50, applicationmodule);
traceprintf2 (ModuleTrace, (const char *) " or try using: gm2 -fscaffold-static %s.mod\\n", 46, applicationmodule);
}
@ -1064,15 +1301,15 @@ extern "C" void M2Dependent_ConstructModules (void * applicationmodule, int argc
do {
if (mptr->dependency.forc)
{
traceprintf2 (ModuleTrace, (const char *) "initializing module: %s for C\\n", 31, mptr->name);
traceprintf3 (ModuleTrace, (const char *) "initializing module: %s [%s] for C\\n", 36, mptr->name, mptr->libname);
}
else
{
traceprintf2 (ModuleTrace, (const char *) "initializing module: %s\\n", 25, mptr->name);
traceprintf3 (ModuleTrace, (const char *) "initializing module: %s [%s]\\n", 30, mptr->name, mptr->libname);
}
if (mptr->dependency.appl)
{
traceprintf2 (ModuleTrace, (const char *) "application module: %s\\n", 24, mptr->name);
traceprintf3 (ModuleTrace, (const char *) "application module: %s [%s]\\n", 29, mptr->name, mptr->libname);
traceprintf (ModuleTrace, (const char *) " calling M2RTS_ExecuteInitialProcedures\\n", 42);
M2RTS_ExecuteInitialProcedures ();
traceprintf (ModuleTrace, (const char *) " calling application module\\n", 30);
@ -1089,11 +1326,11 @@ extern "C" void M2Dependent_ConstructModules (void * applicationmodule, int argc
module constructor in turn.
*/
extern "C" void M2Dependent_DeconstructModules (void * applicationmodule, int argc, void * argv, void * envp)
extern "C" void M2Dependent_DeconstructModules (void * applicationmodule, void * libname, int argc, void * argv, void * envp)
{
M2Dependent_ModuleChain mptr;
traceprintf2 (ModuleTrace, (const char *) "application module finishing: %s\\n", 34, applicationmodule);
traceprintf3 (ModuleTrace, (const char *) "application module finishing: %s [%s]\\n", 39, applicationmodule, libname);
if (Modules.array[M2Dependent_ordered-M2Dependent_unregistered] == NULL)
{
traceprintf (ModuleTrace, (const char *) " no ordered modules found during finishing\\n", 45);
@ -1107,11 +1344,11 @@ extern "C" void M2Dependent_DeconstructModules (void * applicationmodule, int ar
do {
if (mptr->dependency.forc)
{
traceprintf2 (ModuleTrace, (const char *) "finalizing module: %s for C\\n", 29, mptr->name);
traceprintf3 (ModuleTrace, (const char *) "finalizing module: %s [%s] for C\\n", 34, mptr->name, mptr->libname);
}
else
{
traceprintf2 (ModuleTrace, (const char *) "finalizing module: %s\\n", 23, mptr->name);
traceprintf3 (ModuleTrace, (const char *) "finalizing module: %s [%s]\\n", 28, mptr->name, mptr->libname);
}
(*mptr->fini.proc) (argc, argv, envp);
mptr = mptr->prev;
@ -1126,13 +1363,24 @@ extern "C" void M2Dependent_DeconstructModules (void * applicationmodule, int ar
explored to determine initialization order.
*/
extern "C" void M2Dependent_RegisterModule (void * name, M2Dependent_ArgCVEnvP init, M2Dependent_ArgCVEnvP fini, PROC dependencies)
extern "C" void M2Dependent_RegisterModule (void * modulename, void * libname, M2Dependent_ArgCVEnvP init, M2Dependent_ArgCVEnvP fini, PROC dependencies)
{
M2Dependent_ModuleChain mptr;
CheckInitialized ();
if (! M2LINK_StaticInitialization)
{
traceprintf2 (ModuleTrace, (const char *) "module: %s registering\\n", 24, name);
moveTo (M2Dependent_unordered, CreateModule (name, init, fini, dependencies));
mptr = LookupModule (M2Dependent_unordered, modulename, libname);
if (mptr == NULL)
{
traceprintf3 (ModuleTrace, (const char *) "module: %s [%s] registering", 27, modulename, libname);
moveTo (M2Dependent_unordered, CreateModule (modulename, libname, init, fini, dependencies));
traceprintf (ModuleTrace, (const char *) "\\n", 2);
}
else
{
warning3 ((const char *) "module: %s [%s] (ignoring duplicate registration)\\n", 51, modulename, libname);
}
}
}
@ -1143,12 +1391,12 @@ extern "C" void M2Dependent_RegisterModule (void * name, M2Dependent_ArgCVEnvP i
if we are not using StaticInitialization.
*/
extern "C" void M2Dependent_RequestDependant (void * modulename, void * dependantmodule)
extern "C" void M2Dependent_RequestDependant (void * modulename, void * libname, void * dependantmodule, void * dependantlibname)
{
CheckInitialized ();
if (! M2LINK_StaticInitialization)
{
PerformRequestDependant (modulename, dependantmodule);
PerformRequestDependant (modulename, libname, dependantmodule, dependantlibname);
}
}
@ -1157,6 +1405,6 @@ extern "C" void _M2_M2Dependent_init (__attribute__((unused)) int argc,__attribu
CheckInitialized ();
}
extern "C" void _M2_M2Dependent_finish (__attribute__((unused)) int argc,__attribute__((unused)) char *argv[],__attribute__((unused)) char *envp[])
extern "C" void _M2_M2Dependent_fini (__attribute__((unused)) int argc,__attribute__((unused)) char *argv[],__attribute__((unused)) char *envp[])
{
}

15
gcc/m2/pge-boot/GM2Dependent.h
View file

@ -29,8 +29,6 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
#if !defined (_M2Dependent_H)
# define _M2Dependent_H
#include "config.h"
#include "system.h"
# ifdef __cplusplus
extern "C" {
# endif
@ -53,8 +51,8 @@ typedef struct M2Dependent_ArgCVEnvP_p M2Dependent_ArgCVEnvP;
typedef void (*M2Dependent_ArgCVEnvP_t) (int, void *, void *);
struct M2Dependent_ArgCVEnvP_p { M2Dependent_ArgCVEnvP_t proc; };
EXTERN void M2Dependent_ConstructModules (void * applicationmodule, int argc, void * argv, void * envp);
EXTERN void M2Dependent_DeconstructModules (void * applicationmodule, int argc, void * argv, void * envp);
EXTERN void M2Dependent_ConstructModules (void * applicationmodule, void * libname, int argc, void * argv, void * envp);
EXTERN void M2Dependent_DeconstructModules (void * applicationmodule, void * libname, int argc, void * argv, void * envp);
/*
RegisterModule - adds module name to the list of outstanding
@ -62,14 +60,15 @@ EXTERN void M2Dependent_DeconstructModules (void * applicationmodule, int argc,
explored to determine initialization order.
*/
EXTERN void M2Dependent_RegisterModule (void * name, M2Dependent_ArgCVEnvP init, M2Dependent_ArgCVEnvP fini, PROC dependencies);
EXTERN void M2Dependent_RegisterModule (void * modulename, void * libname, M2Dependent_ArgCVEnvP init, M2Dependent_ArgCVEnvP fini, PROC dependencies);
/*
RequestDependant - used to specify that modulename is dependant upon
module dependantmodule.
RequestDependant - used to specify that modulename:libname
is dependant upon
module dependantmodule:dependantlibname
*/
EXTERN void M2Dependent_RequestDependant (void * modulename, void * dependantmodule);
EXTERN void M2Dependent_RequestDependant (void * modulename, void * libname, void * dependantmodule, void * dependantlibname);
# ifdef __cplusplus
}
# endif

6
gcc/m2/pge-boot/GM2EXCEPTION.c
View file

@ -56,13 +56,13 @@ extern "C" M2EXCEPTION_M2Exceptions M2EXCEPTION_M2Exception (void)
n = RTExceptions_GetNumber (e);
if (n == (UINT_MAX))
{
RTExceptions_Raise ( ((unsigned int) (M2EXCEPTION_exException)), const_cast<void*> (reinterpret_cast<const void*>("../../gcc-read-write/gcc/m2/gm2-libs/M2EXCEPTION.mod")), 47, 6, const_cast<void*> (reinterpret_cast<const void*>("M2Exception")), const_cast<void*> (reinterpret_cast<const void*>("current coroutine is not in the exceptional execution state")));
RTExceptions_Raise ( ((unsigned int) (M2EXCEPTION_exException)), const_cast<void*> (reinterpret_cast<const void*>("../../gcc/m2/gm2-libs/M2EXCEPTION.mod")), 47, 6, const_cast<void*> (reinterpret_cast<const void*>("M2Exception")), const_cast<void*> (reinterpret_cast<const void*>("current coroutine is not in the exceptional execution state")));
}
else
{
return (M2EXCEPTION_M2Exceptions) (n);
}
ReturnException ("../../gcc-read-write/gcc/m2/gm2-libs/M2EXCEPTION.def", 25, 1);
ReturnException ("../../gcc/m2/gm2-libs/M2EXCEPTION.def", 25, 1);
__builtin_unreachable ();
}
@ -83,6 +83,6 @@ extern "C" void _M2_M2EXCEPTION_init (__attribute__((unused)) int argc,__attribu
RTExceptions_SetExceptionBlock (RTExceptions_InitExceptionBlock ());
}
extern "C" void _M2_M2EXCEPTION_finish (__attribute__((unused)) int argc,__attribute__((unused)) char *argv[],__attribute__((unused)) char *envp[])
extern "C" void _M2_M2EXCEPTION_fini (__attribute__((unused)) int argc,__attribute__((unused)) char *argv[],__attribute__((unused)) char *envp[])
{
}

76
gcc/m2/pge-boot/GM2RTS.c
View file

@ -99,14 +99,14 @@ static unsigned int Initialized;
module constructor in turn.
*/
extern "C" void M2RTS_ConstructModules (void * applicationmodule, int argc, void * argv, void * envp);
extern "C" void M2RTS_ConstructModules (void * applicationmodule, void * libname, int argc, void * argv, void * envp);
/*
DeconstructModules - resolve dependencies and then call each
module constructor in turn.
*/
extern "C" void M2RTS_DeconstructModules (void * applicationmodule, int argc, void * argv, void * envp);
extern "C" void M2RTS_DeconstructModules (void * applicationmodule, void * libname, int argc, void * argv, void * envp);
/*
RegisterModule - adds module name to the list of outstanding
@ -114,14 +114,14 @@ extern "C" void M2RTS_DeconstructModules (void * applicationmodule, int argc, vo
explored to determine initialization order.
*/
extern "C" void M2RTS_RegisterModule (void * name, M2RTS_ArgCVEnvP init, M2RTS_ArgCVEnvP fini, PROC dependencies);
extern "C" void M2RTS_RegisterModule (void * name, void * libname, M2RTS_ArgCVEnvP init, M2RTS_ArgCVEnvP fini, PROC dependencies);
/*
RequestDependant - used to specify that modulename is dependant upon
module dependantmodule.
*/
extern "C" void M2RTS_RequestDependant (void * modulename, void * dependantmodule);
extern "C" void M2RTS_RequestDependant (void * modulename, void * libname, void * dependantmodule, void * dependantlibname);
/*
InstallTerminationProcedure - installs a procedure, p, which will
@ -191,7 +191,7 @@ extern "C" void M2RTS_Halt (const char *filename_, unsigned int _filename_high,
to stderr and calls exit (1).
*/
extern "C" void M2RTS_HaltC (void * filename, unsigned int line, void * function, void * description);
extern "C" void M2RTS_HaltC (void * filename, unsigned int line, void * function, void * description) __attribute__ ((noreturn));
/*
ExitOnHalt - if HALT is executed then call exit with the exit code, e.
@ -212,30 +212,30 @@ extern "C" void M2RTS_ErrorMessage (const char *message_, unsigned int _message_
*/
extern "C" unsigned int M2RTS_Length (const char *a_, unsigned int _a_high);
extern "C" void M2RTS_AssignmentException (void * filename, unsigned int line, unsigned int column, void * scope, void * message);
extern "C" void M2RTS_ReturnException (void * filename, unsigned int line, unsigned int column, void * scope, void * message);
extern "C" void M2RTS_IncException (void * filename, unsigned int line, unsigned int column, void * scope, void * message);
extern "C" void M2RTS_DecException (void * filename, unsigned int line, unsigned int column, void * scope, void * message);
extern "C" void M2RTS_InclException (void * filename, unsigned int line, unsigned int column, void * scope, void * message);
extern "C" void M2RTS_ExclException (void * filename, unsigned int line, unsigned int column, void * scope, void * message);
extern "C" void M2RTS_ShiftException (void * filename, unsigned int line, unsigned int column, void * scope, void * message);
extern "C" void M2RTS_RotateException (void * filename, unsigned int line, unsigned int column, void * scope, void * message);
extern "C" void M2RTS_StaticArraySubscriptException (void * filename, unsigned int line, unsigned int column, void * scope, void * message);
extern "C" void M2RTS_DynamicArraySubscriptException (void * filename, unsigned int line, unsigned int column, void * scope, void * message);
extern "C" void M2RTS_ForLoopBeginException (void * filename, unsigned int line, unsigned int column, void * scope, void * message);
extern "C" void M2RTS_ForLoopToException (void * filename, unsigned int line, unsigned int column, void * scope, void * message);
extern "C" void M2RTS_ForLoopEndException (void * filename, unsigned int line, unsigned int column, void * scope, void * message);
extern "C" void M2RTS_PointerNilException (void * filename, unsigned int line, unsigned int column, void * scope, void * message);
extern "C" void M2RTS_NoReturnException (void * filename, unsigned int line, unsigned int column, void * scope, void * message);
extern "C" void M2RTS_CaseException (void * filename, unsigned int line, unsigned int column, void * scope, void * message);
extern "C" void M2RTS_WholeNonPosDivException (void * filename, unsigned int line, unsigned int column, void * scope, void * message);
extern "C" void M2RTS_WholeNonPosModException (void * filename, unsigned int line, unsigned int column, void * scope, void * message);
extern "C" void M2RTS_WholeZeroDivException (void * filename, unsigned int line, unsigned int column, void * scope, void * message);
extern "C" void M2RTS_WholeZeroRemException (void * filename, unsigned int line, unsigned int column, void * scope, void * message);
extern "C" void M2RTS_WholeValueException (void * filename, unsigned int line, unsigned int column, void * scope, void * message);
extern "C" void M2RTS_RealValueException (void * filename, unsigned int line, unsigned int column, void * scope, void * message);
extern "C" void M2RTS_ParameterException (void * filename, unsigned int line, unsigned int column, void * scope, void * message);
extern "C" void M2RTS_NoException (void * filename, unsigned int line, unsigned int column, void * scope, void * message);
extern "C" void M2RTS_AssignmentException (void * filename, unsigned int line, unsigned int column, void * scope, void * message) __attribute__ ((noreturn));
extern "C" void M2RTS_ReturnException (void * filename, unsigned int line, unsigned int column, void * scope, void * message) __attribute__ ((noreturn));
extern "C" void M2RTS_IncException (void * filename, unsigned int line, unsigned int column, void * scope, void * message) __attribute__ ((noreturn));
extern "C" void M2RTS_DecException (void * filename, unsigned int line, unsigned int column, void * scope, void * message) __attribute__ ((noreturn));
extern "C" void M2RTS_InclException (void * filename, unsigned int line, unsigned int column, void * scope, void * message) __attribute__ ((noreturn));
extern "C" void M2RTS_ExclException (void * filename, unsigned int line, unsigned int column, void * scope, void * message) __attribute__ ((noreturn));
extern "C" void M2RTS_ShiftException (void * filename, unsigned int line, unsigned int column, void * scope, void * message) __attribute__ ((noreturn));
extern "C" void M2RTS_RotateException (void * filename, unsigned int line, unsigned int column, void * scope, void * message) __attribute__ ((noreturn));
extern "C" void M2RTS_StaticArraySubscriptException (void * filename, unsigned int line, unsigned int column, void * scope, void * message) __attribute__ ((noreturn));
extern "C" void M2RTS_DynamicArraySubscriptException (void * filename, unsigned int line, unsigned int column, void * scope, void * message) __attribute__ ((noreturn));
extern "C" void M2RTS_ForLoopBeginException (void * filename, unsigned int line, unsigned int column, void * scope, void * message) __attribute__ ((noreturn));
extern "C" void M2RTS_ForLoopToException (void * filename, unsigned int line, unsigned int column, void * scope, void * message) __attribute__ ((noreturn));
extern "C" void M2RTS_ForLoopEndException (void * filename, unsigned int line, unsigned int column, void * scope, void * message) __attribute__ ((noreturn));
extern "C" void M2RTS_PointerNilException (void * filename, unsigned int line, unsigned int column, void * scope, void * message) __attribute__ ((noreturn));
extern "C" void M2RTS_NoReturnException (void * filename, unsigned int line, unsigned int column, void * scope, void * message) __attribute__ ((noreturn));
extern "C" void M2RTS_CaseException (void * filename, unsigned int line, unsigned int column, void * scope, void * message) __attribute__ ((noreturn));
extern "C" void M2RTS_WholeNonPosDivException (void * filename, unsigned int line, unsigned int column, void * scope, void * message) __attribute__ ((noreturn));
extern "C" void M2RTS_WholeNonPosModException (void * filename, unsigned int line, unsigned int column, void * scope, void * message) __attribute__ ((noreturn));
extern "C" void M2RTS_WholeZeroDivException (void * filename, unsigned int line, unsigned int column, void * scope, void * message) __attribute__ ((noreturn));
extern "C" void M2RTS_WholeZeroRemException (void * filename, unsigned int line, unsigned int column, void * scope, void * message) __attribute__ ((noreturn));
extern "C" void M2RTS_WholeValueException (void * filename, unsigned int line, unsigned int column, void * scope, void * message) __attribute__ ((noreturn));
extern "C" void M2RTS_RealValueException (void * filename, unsigned int line, unsigned int column, void * scope, void * message) __attribute__ ((noreturn));
extern "C" void M2RTS_ParameterException (void * filename, unsigned int line, unsigned int column, void * scope, void * message) __attribute__ ((noreturn));
extern "C" void M2RTS_NoException (void * filename, unsigned int line, unsigned int column, void * scope, void * message) __attribute__ ((noreturn));
/*
ExecuteReverse - execute the procedure associated with procptr
@ -437,9 +437,9 @@ static void CheckInitialized (void)
module constructor in turn.
*/
extern "C" void M2RTS_ConstructModules (void * applicationmodule, int argc, void * argv, void * envp)
extern "C" void M2RTS_ConstructModules (void * applicationmodule, void * libname, int argc, void * argv, void * envp)
{
M2Dependent_ConstructModules (applicationmodule, argc, argv, envp);
M2Dependent_ConstructModules (applicationmodule, libname, argc, argv, envp);
}
@ -448,9 +448,9 @@ extern "C" void M2RTS_ConstructModules (void * applicationmodule, int argc, void
module constructor in turn.
*/
extern "C" void M2RTS_DeconstructModules (void * applicationmodule, int argc, void * argv, void * envp)
extern "C" void M2RTS_DeconstructModules (void * applicationmodule, void * libname, int argc, void * argv, void * envp)
{
M2Dependent_DeconstructModules (applicationmodule, argc, argv, envp);
M2Dependent_DeconstructModules (applicationmodule, libname, argc, argv, envp);
}
@ -460,9 +460,9 @@ extern "C" void M2RTS_DeconstructModules (void * applicationmodule, int argc, vo
explored to determine initialization order.
*/
extern "C" void M2RTS_RegisterModule (void * name, M2RTS_ArgCVEnvP init, M2RTS_ArgCVEnvP fini, PROC dependencies)
extern "C" void M2RTS_RegisterModule (void * name, void * libname, M2RTS_ArgCVEnvP init, M2RTS_ArgCVEnvP fini, PROC dependencies)
{
M2Dependent_RegisterModule (name, (M2Dependent_ArgCVEnvP) {(M2Dependent_ArgCVEnvP_t) init.proc}, (M2Dependent_ArgCVEnvP) {(M2Dependent_ArgCVEnvP_t) fini.proc}, dependencies);
M2Dependent_RegisterModule (name, libname, (M2Dependent_ArgCVEnvP) {(M2Dependent_ArgCVEnvP_t) init.proc}, (M2Dependent_ArgCVEnvP) {(M2Dependent_ArgCVEnvP_t) fini.proc}, dependencies);
}
@ -471,9 +471,9 @@ extern "C" void M2RTS_RegisterModule (void * name, M2RTS_ArgCVEnvP init, M2RTS_A
module dependantmodule.
*/
extern "C" void M2RTS_RequestDependant (void * modulename, void * dependantmodule)
extern "C" void M2RTS_RequestDependant (void * modulename, void * libname, void * dependantmodule, void * dependantlibname)
{
M2Dependent_RequestDependant (modulename, dependantmodule);
M2Dependent_RequestDependant (modulename, libname, dependantmodule, dependantlibname);
}
@ -817,6 +817,6 @@ extern "C" void _M2_M2RTS_init (__attribute__((unused)) int argc,__attribute__((
CheckInitialized ();
}
extern "C" void _M2_M2RTS_finish (__attribute__((unused)) int argc,__attribute__((unused)) char *argv[],__attribute__((unused)) char *envp[])
extern "C" void _M2_M2RTS_fini (__attribute__((unused)) int argc,__attribute__((unused)) char *argv[],__attribute__((unused)) char *envp[])
{
}

73
gcc/m2/pge-boot/GM2RTS.h
View file

@ -29,8 +29,6 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
#if !defined (_M2RTS_H)
# define _M2RTS_H
#include "config.h"
#include "system.h"
# ifdef __cplusplus
extern "C" {
# endif
@ -53,8 +51,8 @@ typedef struct M2RTS_ArgCVEnvP_p M2RTS_ArgCVEnvP;
typedef void (*M2RTS_ArgCVEnvP_t) (int, void *, void *);
struct M2RTS_ArgCVEnvP_p { M2RTS_ArgCVEnvP_t proc; };
EXTERN void M2RTS_ConstructModules (void * applicationmodule, int argc, void * argv, void * envp);
EXTERN void M2RTS_DeconstructModules (void * applicationmodule, int argc, void * argv, void * envp);
EXTERN void M2RTS_ConstructModules (void * applicationmodule, void * libname, int argc, void * argv, void * envp);
EXTERN void M2RTS_DeconstructModules (void * applicationmodule, void * libname, int argc, void * argv, void * envp);
/*
RegisterModule - adds module name to the list of outstanding
@ -62,14 +60,14 @@ EXTERN void M2RTS_DeconstructModules (void * applicationmodule, int argc, void *
explored to determine initialization order.
*/
EXTERN void M2RTS_RegisterModule (void * name, M2RTS_ArgCVEnvP init, M2RTS_ArgCVEnvP fini, PROC dependencies);
EXTERN void M2RTS_RegisterModule (void * name, void * libname, M2RTS_ArgCVEnvP init, M2RTS_ArgCVEnvP fini, PROC dependencies);
/*
RequestDependant - used to specify that modulename is dependant upon
module dependantmodule.
*/
EXTERN void M2RTS_RequestDependant (void * modulename, void * dependantmodule);
EXTERN void M2RTS_RequestDependant (void * modulename, void * libname, void * dependantmodule, void * dependantlibname);
/*
InstallTerminationProcedure - installs a procedure, p, which will
@ -126,10 +124,19 @@ EXTERN void M2RTS_HALT (int exitcode) __attribute__ ((noreturn));
/*
Halt - provides a more user friendly version of HALT, which takes
four parameters to aid debugging.
four parameters to aid debugging. It writes an error message
to stderr and calls exit (1).
*/
EXTERN void M2RTS_Halt (const char *file_, unsigned int _file_high, unsigned int line, const char *function_, unsigned int _function_high, const char *description_, unsigned int _description_high) __attribute__ ((noreturn));
EXTERN void M2RTS_Halt (const char *filename_, unsigned int _filename_high, unsigned int line, const char *function_, unsigned int _function_high, const char *description_, unsigned int _description_high) __attribute__ ((noreturn));
/*
HaltC - provides a more user friendly version of HALT, which takes
four parameters to aid debugging. It writes an error message
to stderr and calls exit (1).
*/
EXTERN void M2RTS_HaltC (void * filename, unsigned int line, void * function, void * description) __attribute__ ((noreturn));
/*
ExitOnHalt - if HALT is executed then call exit with the exit code, e.
@ -141,7 +148,7 @@ EXTERN void M2RTS_ExitOnHalt (int e);
ErrorMessage - emits an error message to stderr and then calls exit (1).
*/
EXTERN void M2RTS_ErrorMessage (const char *message_, unsigned int _message_high, const char *file_, unsigned int _file_high, unsigned int line, const char *function_, unsigned int _function_high) __attribute__ ((noreturn));
EXTERN void M2RTS_ErrorMessage (const char *message_, unsigned int _message_high, const char *filename_, unsigned int _filename_high, unsigned int line, const char *function_, unsigned int _function_high) __attribute__ ((noreturn));
/*
Length - returns the length of a string, a. This is called whenever
@ -150,30 +157,30 @@ EXTERN void M2RTS_ErrorMessage (const char *message_, unsigned int _message_high
*/
EXTERN unsigned int M2RTS_Length (const char *a_, unsigned int _a_high);
EXTERN void M2RTS_AssignmentException (void * filename, unsigned int line, unsigned int column, void * scope, void * message);
EXTERN void M2RTS_ReturnException (void * filename, unsigned int line, unsigned int column, void * scope, void * message);
EXTERN void M2RTS_IncException (void * filename, unsigned int line, unsigned int column, void * scope, void * message);
EXTERN void M2RTS_DecException (void * filename, unsigned int line, unsigned int column, void * scope, void * message);
EXTERN void M2RTS_InclException (void * filename, unsigned int line, unsigned int column, void * scope, void * message);
EXTERN void M2RTS_ExclException (void * filename, unsigned int line, unsigned int column, void * scope, void * message);
EXTERN void M2RTS_ShiftException (void * filename, unsigned int line, unsigned int column, void * scope, void * message);
EXTERN void M2RTS_RotateException (void * filename, unsigned int line, unsigned int column, void * scope, void * message);
EXTERN void M2RTS_StaticArraySubscriptException (void * filename, unsigned int line, unsigned int column, void * scope, void * message);
EXTERN void M2RTS_DynamicArraySubscriptException (void * filename, unsigned int line, unsigned int column, void * scope, void * message);
EXTERN void M2RTS_ForLoopBeginException (void * filename, unsigned int line, unsigned int column, void * scope, void * message);
EXTERN void M2RTS_ForLoopToException (void * filename, unsigned int line, unsigned int column, void * scope, void * message);
EXTERN void M2RTS_ForLoopEndException (void * filename, unsigned int line, unsigned int column, void * scope, void * message);
EXTERN void M2RTS_PointerNilException (void * filename, unsigned int line, unsigned int column, void * scope, void * message);
EXTERN void M2RTS_NoReturnException (void * filename, unsigned int line, unsigned int column, void * scope, void * message);
EXTERN void M2RTS_CaseException (void * filename, unsigned int line, unsigned int column, void * scope, void * message);
EXTERN void M2RTS_WholeNonPosDivException (void * filename, unsigned int line, unsigned int column, void * scope, void * message);
EXTERN void M2RTS_WholeNonPosModException (void * filename, unsigned int line, unsigned int column, void * scope, void * message);
EXTERN void M2RTS_WholeZeroDivException (void * filename, unsigned int line, unsigned int column, void * scope, void * message);
EXTERN void M2RTS_WholeZeroRemException (void * filename, unsigned int line, unsigned int column, void * scope, void * message);
EXTERN void M2RTS_WholeValueException (void * filename, unsigned int line, unsigned int column, void * scope, void * message);
EXTERN void M2RTS_RealValueException (void * filename, unsigned int line, unsigned int column, void * scope, void * message);
EXTERN void M2RTS_ParameterException (void * filename, unsigned int line, unsigned int column, void * scope, void * message);
EXTERN void M2RTS_NoException (void * filename, unsigned int line, unsigned int column, void * scope, void * message);
EXTERN void M2RTS_AssignmentException (void * filename, unsigned int line, unsigned int column, void * scope, void * message) __attribute__ ((noreturn));
EXTERN void M2RTS_ReturnException (void * filename, unsigned int line, unsigned int column, void * scope, void * message) __attribute__ ((noreturn));
EXTERN void M2RTS_IncException (void * filename, unsigned int line, unsigned int column, void * scope, void * message) __attribute__ ((noreturn));
EXTERN void M2RTS_DecException (void * filename, unsigned int line, unsigned int column, void * scope, void * message) __attribute__ ((noreturn));
EXTERN void M2RTS_InclException (void * filename, unsigned int line, unsigned int column, void * scope, void * message) __attribute__ ((noreturn));
EXTERN void M2RTS_ExclException (void * filename, unsigned int line, unsigned int column, void * scope, void * message) __attribute__ ((noreturn));
EXTERN void M2RTS_ShiftException (void * filename, unsigned int line, unsigned int column, void * scope, void * message) __attribute__ ((noreturn));
EXTERN void M2RTS_RotateException (void * filename, unsigned int line, unsigned int column, void * scope, void * message) __attribute__ ((noreturn));
EXTERN void M2RTS_StaticArraySubscriptException (void * filename, unsigned int line, unsigned int column, void * scope, void * message) __attribute__ ((noreturn));
EXTERN void M2RTS_DynamicArraySubscriptException (void * filename, unsigned int line, unsigned int column, void * scope, void * message) __attribute__ ((noreturn));
EXTERN void M2RTS_ForLoopBeginException (void * filename, unsigned int line, unsigned int column, void * scope, void * message) __attribute__ ((noreturn));
EXTERN void M2RTS_ForLoopToException (void * filename, unsigned int line, unsigned int column, void * scope, void * message) __attribute__ ((noreturn));
EXTERN void M2RTS_ForLoopEndException (void * filename, unsigned int line, unsigned int column, void * scope, void * message) __attribute__ ((noreturn));
EXTERN void M2RTS_PointerNilException (void * filename, unsigned int line, unsigned int column, void * scope, void * message) __attribute__ ((noreturn));
EXTERN void M2RTS_NoReturnException (void * filename, unsigned int line, unsigned int column, void * scope, void * message) __attribute__ ((noreturn));
EXTERN void M2RTS_CaseException (void * filename, unsigned int line, unsigned int column, void * scope, void * message) __attribute__ ((noreturn));
EXTERN void M2RTS_WholeNonPosDivException (void * filename, unsigned int line, unsigned int column, void * scope, void * message) __attribute__ ((noreturn));
EXTERN void M2RTS_WholeNonPosModException (void * filename, unsigned int line, unsigned int column, void * scope, void * message) __attribute__ ((noreturn));
EXTERN void M2RTS_WholeZeroDivException (void * filename, unsigned int line, unsigned int column, void * scope, void * message) __attribute__ ((noreturn));
EXTERN void M2RTS_WholeZeroRemException (void * filename, unsigned int line, unsigned int column, void * scope, void * message) __attribute__ ((noreturn));
EXTERN void M2RTS_WholeValueException (void * filename, unsigned int line, unsigned int column, void * scope, void * message) __attribute__ ((noreturn));
EXTERN void M2RTS_RealValueException (void * filename, unsigned int line, unsigned int column, void * scope, void * message) __attribute__ ((noreturn));
EXTERN void M2RTS_ParameterException (void * filename, unsigned int line, unsigned int column, void * scope, void * message) __attribute__ ((noreturn));
EXTERN void M2RTS_NoException (void * filename, unsigned int line, unsigned int column, void * scope, void * message) __attribute__ ((noreturn));
# ifdef __cplusplus
}
# endif

6
gcc/m2/pge-boot/GNameKey.c
View file

@ -330,7 +330,7 @@ extern "C" NameKey_Name NameKey_MakeKey (const char *a_, unsigned int _a_high)
(*p) = ASCII_nul;
return DoMakeKey (n, higha);
}
ReturnException ("../../gcc-read-write/gcc/m2/gm2-compiler/NameKey.def", 20, 1);
ReturnException ("../../gcc/m2/gm2-compiler/NameKey.def", 20, 1);
__builtin_unreachable ();
}
@ -380,7 +380,7 @@ extern "C" NameKey_Name NameKey_makekey (void * a)
return DoMakeKey (n, higha);
}
}
ReturnException ("../../gcc-read-write/gcc/m2/gm2-compiler/NameKey.def", 20, 1);
ReturnException ("../../gcc/m2/gm2-compiler/NameKey.def", 20, 1);
__builtin_unreachable ();
}
@ -607,6 +607,6 @@ extern "C" void _M2_NameKey_init (__attribute__((unused)) int argc,__attribute__
BinaryTree->Left = NULL;
}
extern "C" void _M2_NameKey_finish (__attribute__((unused)) int argc,__attribute__((unused)) char *argv[],__attribute__((unused)) char *envp[])
extern "C" void _M2_NameKey_fini (__attribute__((unused)) int argc,__attribute__((unused)) char *argv[],__attribute__((unused)) char *envp[])
{
}

2
gcc/m2/pge-boot/GNumberIO.c
View file

@ -772,6 +772,6 @@ extern "C" void _M2_NumberIO_init (__attribute__((unused)) int argc,__attribute_
{
}
extern "C" void _M2_NumberIO_finish (__attribute__((unused)) int argc,__attribute__((unused)) char *argv[],__attribute__((unused)) char *envp[])
extern "C" void _M2_NumberIO_fini (__attribute__((unused)) int argc,__attribute__((unused)) char *argv[],__attribute__((unused)) char *envp[])
{
}

2
gcc/m2/pge-boot/GOutput.c
View file

@ -310,6 +310,6 @@ extern "C" void _M2_Output_init (__attribute__((unused)) int argc,__attribute__(
outputFile = FIO_StdOut;
}
extern "C" void _M2_Output_finish (__attribute__((unused)) int argc,__attribute__((unused)) char *argv[],__attribute__((unused)) char *envp[])
extern "C" void _M2_Output_fini (__attribute__((unused)) int argc,__attribute__((unused)) char *argv[],__attribute__((unused)) char *envp[])
{
}

8
gcc/m2/pge-boot/GPushBackInput.c
View file

@ -275,7 +275,7 @@ extern "C" char PushBackInput_PutCh (char ch)
}
else
{
Debug_Halt ((const char *) "max push back stack exceeded, increase MaxPushBackStack", 55, 150, (const char *) "../../gcc-read-write/gcc/m2/gm2-libs/PushBackInput.mod", 54);
Debug_Halt ((const char *) "max push back stack exceeded, increase MaxPushBackStack", 55, 150, (const char *) "../../gcc/m2/gm2-libs/PushBackInput.mod", 39);
}
return ch;
/* static analysis guarentees a RETURN statement will be used before here. */
@ -301,7 +301,7 @@ extern "C" void PushBackInput_PutString (const char *a_, unsigned int _a_high)
l -= 1;
if ((PushBackInput_PutCh (a[l])) != a[l])
{
Debug_Halt ((const char *) "assert failed", 13, 132, (const char *) "../../gcc-read-write/gcc/m2/gm2-libs/PushBackInput.mod", 54);
Debug_Halt ((const char *) "assert failed", 13, 132, (const char *) "../../gcc/m2/gm2-libs/PushBackInput.mod", 39);
}
}
}
@ -322,7 +322,7 @@ extern "C" void PushBackInput_PutStr (DynamicStrings_String s)
i -= 1;
if ((PushBackInput_PutCh (DynamicStrings_char (s, static_cast<int> (i)))) != (DynamicStrings_char (s, static_cast<int> (i))))
{
Debug_Halt ((const char *) "assert failed", 13, 113, (const char *) "../../gcc-read-write/gcc/m2/gm2-libs/PushBackInput.mod", 54);
Debug_Halt ((const char *) "assert failed", 13, 113, (const char *) "../../gcc/m2/gm2-libs/PushBackInput.mod", 39);
}
}
}
@ -484,6 +484,6 @@ extern "C" void _M2_PushBackInput_init (__attribute__((unused)) int argc,__attri
Init ();
}
extern "C" void _M2_PushBackInput_finish (__attribute__((unused)) int argc,__attribute__((unused)) char *argv[],__attribute__((unused)) char *envp[])
extern "C" void _M2_PushBackInput_fini (__attribute__((unused)) int argc,__attribute__((unused)) char *argv[],__attribute__((unused)) char *envp[])
{
}

42
gcc/m2/pge-boot/GRTExceptions.c
View file

@ -107,7 +107,7 @@ static void * currentSource;
and message in the EHBlock for later use.
*/
extern "C" void RTExceptions_Raise (unsigned int number, void * file, unsigned int line, unsigned int column, void * function, void * message);
extern "C" void RTExceptions_Raise (unsigned int number, void * file, unsigned int line, unsigned int column, void * function, void * message) __attribute__ ((noreturn));
/*
SetExceptionBlock - sets, source, as the active EHB.
@ -242,7 +242,7 @@ static RTExceptions_Handler findHandler (RTExceptions_EHBlock e, unsigned int nu
exception in the active EHB.
*/
static void InvokeHandler (void);
static void InvokeHandler (void) __attribute__ ((noreturn));
/*
DoThrow - throw the exception number in the exception block.
@ -488,6 +488,8 @@ static void InvokeHandler (void)
else
{
(*h->p.proc) ();
M2RTS_HALT (-1);
__builtin_unreachable ();
}
}
@ -722,7 +724,7 @@ static void AddHandler (RTExceptions_EHBlock e, RTExceptions_Handler h)
static void indexf (void * a)
{
RTExceptions_Raise ( ((unsigned int) (M2EXCEPTION_indexException)), const_cast<void*> (reinterpret_cast<const void*>("../../gcc-read-write/gcc/m2/gm2-libs/RTExceptions.mod")), 612, 9, const_cast<void*> (reinterpret_cast<const void*>("indexf")), const_cast<void*> (reinterpret_cast<const void*>("array index out of bounds")));
RTExceptions_Raise ( ((unsigned int) (M2EXCEPTION_indexException)), const_cast<void*> (reinterpret_cast<const void*>("../../gcc/m2/gm2-libs/RTExceptions.mod")), 613, 9, const_cast<void*> (reinterpret_cast<const void*>("indexf")), const_cast<void*> (reinterpret_cast<const void*>("array index out of bounds")));
}
@ -732,7 +734,7 @@ static void indexf (void * a)
static void range (void * a)
{
RTExceptions_Raise ( ((unsigned int) (M2EXCEPTION_rangeException)), const_cast<void*> (reinterpret_cast<const void*>("../../gcc-read-write/gcc/m2/gm2-libs/RTExceptions.mod")), 624, 9, const_cast<void*> (reinterpret_cast<const void*>("range")), const_cast<void*> (reinterpret_cast<const void*>("assignment out of range")));
RTExceptions_Raise ( ((unsigned int) (M2EXCEPTION_rangeException)), const_cast<void*> (reinterpret_cast<const void*>("../../gcc/m2/gm2-libs/RTExceptions.mod")), 625, 9, const_cast<void*> (reinterpret_cast<const void*>("range")), const_cast<void*> (reinterpret_cast<const void*>("assignment out of range")));
}
@ -742,7 +744,7 @@ static void range (void * a)
static void casef (void * a)
{
RTExceptions_Raise ( ((unsigned int) (M2EXCEPTION_caseSelectException)), const_cast<void*> (reinterpret_cast<const void*>("../../gcc-read-write/gcc/m2/gm2-libs/RTExceptions.mod")), 636, 9, const_cast<void*> (reinterpret_cast<const void*>("casef")), const_cast<void*> (reinterpret_cast<const void*>("case selector out of range")));
RTExceptions_Raise ( ((unsigned int) (M2EXCEPTION_caseSelectException)), const_cast<void*> (reinterpret_cast<const void*>("../../gcc/m2/gm2-libs/RTExceptions.mod")), 637, 9, const_cast<void*> (reinterpret_cast<const void*>("casef")), const_cast<void*> (reinterpret_cast<const void*>("case selector out of range")));
}
@ -752,7 +754,7 @@ static void casef (void * a)
static void invalidloc (void * a)
{
RTExceptions_Raise ( ((unsigned int) (M2EXCEPTION_invalidLocation)), const_cast<void*> (reinterpret_cast<const void*>("../../gcc-read-write/gcc/m2/gm2-libs/RTExceptions.mod")), 648, 9, const_cast<void*> (reinterpret_cast<const void*>("invalidloc")), const_cast<void*> (reinterpret_cast<const void*>("invalid address referenced")));
RTExceptions_Raise ( ((unsigned int) (M2EXCEPTION_invalidLocation)), const_cast<void*> (reinterpret_cast<const void*>("../../gcc/m2/gm2-libs/RTExceptions.mod")), 649, 9, const_cast<void*> (reinterpret_cast<const void*>("invalidloc")), const_cast<void*> (reinterpret_cast<const void*>("invalid address referenced")));
}
@ -762,7 +764,7 @@ static void invalidloc (void * a)
static void function (void * a)
{
RTExceptions_Raise ( ((unsigned int) (M2EXCEPTION_functionException)), const_cast<void*> (reinterpret_cast<const void*>("../../gcc-read-write/gcc/m2/gm2-libs/RTExceptions.mod")), 660, 9, const_cast<void*> (reinterpret_cast<const void*>("function")), const_cast<void*> (reinterpret_cast<const void*>("... function ... "))); /* --fixme-- what has happened ? */
RTExceptions_Raise ( ((unsigned int) (M2EXCEPTION_functionException)), const_cast<void*> (reinterpret_cast<const void*>("../../gcc/m2/gm2-libs/RTExceptions.mod")), 661, 9, const_cast<void*> (reinterpret_cast<const void*>("function")), const_cast<void*> (reinterpret_cast<const void*>("... function ... "))); /* --fixme-- what has happened ? */
}
@ -772,7 +774,7 @@ static void function (void * a)
static void wholevalue (void * a)
{
RTExceptions_Raise ( ((unsigned int) (M2EXCEPTION_wholeValueException)), const_cast<void*> (reinterpret_cast<const void*>("../../gcc-read-write/gcc/m2/gm2-libs/RTExceptions.mod")), 672, 9, const_cast<void*> (reinterpret_cast<const void*>("wholevalue")), const_cast<void*> (reinterpret_cast<const void*>("illegal whole value exception")));
RTExceptions_Raise ( ((unsigned int) (M2EXCEPTION_wholeValueException)), const_cast<void*> (reinterpret_cast<const void*>("../../gcc/m2/gm2-libs/RTExceptions.mod")), 673, 9, const_cast<void*> (reinterpret_cast<const void*>("wholevalue")), const_cast<void*> (reinterpret_cast<const void*>("illegal whole value exception")));
}
@ -782,7 +784,7 @@ static void wholevalue (void * a)
static void wholediv (void * a)
{
RTExceptions_Raise ( ((unsigned int) (M2EXCEPTION_wholeDivException)), const_cast<void*> (reinterpret_cast<const void*>("../../gcc-read-write/gcc/m2/gm2-libs/RTExceptions.mod")), 684, 9, const_cast<void*> (reinterpret_cast<const void*>("wholediv")), const_cast<void*> (reinterpret_cast<const void*>("illegal whole value exception")));
RTExceptions_Raise ( ((unsigned int) (M2EXCEPTION_wholeDivException)), const_cast<void*> (reinterpret_cast<const void*>("../../gcc/m2/gm2-libs/RTExceptions.mod")), 685, 9, const_cast<void*> (reinterpret_cast<const void*>("wholediv")), const_cast<void*> (reinterpret_cast<const void*>("illegal whole value exception")));
}
@ -792,7 +794,7 @@ static void wholediv (void * a)
static void realvalue (void * a)
{
RTExceptions_Raise ( ((unsigned int) (M2EXCEPTION_realValueException)), const_cast<void*> (reinterpret_cast<const void*>("../../gcc-read-write/gcc/m2/gm2-libs/RTExceptions.mod")), 696, 9, const_cast<void*> (reinterpret_cast<const void*>("realvalue")), const_cast<void*> (reinterpret_cast<const void*>("illegal real value exception")));
RTExceptions_Raise ( ((unsigned int) (M2EXCEPTION_realValueException)), const_cast<void*> (reinterpret_cast<const void*>("../../gcc/m2/gm2-libs/RTExceptions.mod")), 697, 9, const_cast<void*> (reinterpret_cast<const void*>("realvalue")), const_cast<void*> (reinterpret_cast<const void*>("illegal real value exception")));
}
@ -802,7 +804,7 @@ static void realvalue (void * a)
static void realdiv (void * a)
{
RTExceptions_Raise ( ((unsigned int) (M2EXCEPTION_realDivException)), const_cast<void*> (reinterpret_cast<const void*>("../../gcc-read-write/gcc/m2/gm2-libs/RTExceptions.mod")), 708, 9, const_cast<void*> (reinterpret_cast<const void*>("realdiv")), const_cast<void*> (reinterpret_cast<const void*>("real number division by zero exception")));
RTExceptions_Raise ( ((unsigned int) (M2EXCEPTION_realDivException)), const_cast<void*> (reinterpret_cast<const void*>("../../gcc/m2/gm2-libs/RTExceptions.mod")), 709, 9, const_cast<void*> (reinterpret_cast<const void*>("realdiv")), const_cast<void*> (reinterpret_cast<const void*>("real number division by zero exception")));
}
@ -812,7 +814,7 @@ static void realdiv (void * a)
static void complexvalue (void * a)
{
RTExceptions_Raise ( ((unsigned int) (M2EXCEPTION_complexValueException)), const_cast<void*> (reinterpret_cast<const void*>("../../gcc-read-write/gcc/m2/gm2-libs/RTExceptions.mod")), 720, 9, const_cast<void*> (reinterpret_cast<const void*>("complexvalue")), const_cast<void*> (reinterpret_cast<const void*>("illegal complex value exception")));
RTExceptions_Raise ( ((unsigned int) (M2EXCEPTION_complexValueException)), const_cast<void*> (reinterpret_cast<const void*>("../../gcc/m2/gm2-libs/RTExceptions.mod")), 721, 9, const_cast<void*> (reinterpret_cast<const void*>("complexvalue")), const_cast<void*> (reinterpret_cast<const void*>("illegal complex value exception")));
}
@ -822,7 +824,7 @@ static void complexvalue (void * a)
static void complexdiv (void * a)
{
RTExceptions_Raise ( ((unsigned int) (M2EXCEPTION_complexDivException)), const_cast<void*> (reinterpret_cast<const void*>("../../gcc-read-write/gcc/m2/gm2-libs/RTExceptions.mod")), 732, 9, const_cast<void*> (reinterpret_cast<const void*>("complexdiv")), const_cast<void*> (reinterpret_cast<const void*>("complex number division by zero exception")));
RTExceptions_Raise ( ((unsigned int) (M2EXCEPTION_complexDivException)), const_cast<void*> (reinterpret_cast<const void*>("../../gcc/m2/gm2-libs/RTExceptions.mod")), 733, 9, const_cast<void*> (reinterpret_cast<const void*>("complexdiv")), const_cast<void*> (reinterpret_cast<const void*>("complex number division by zero exception")));
}
@ -832,7 +834,7 @@ static void complexdiv (void * a)
static void protection (void * a)
{
RTExceptions_Raise ( ((unsigned int) (M2EXCEPTION_protException)), const_cast<void*> (reinterpret_cast<const void*>("../../gcc-read-write/gcc/m2/gm2-libs/RTExceptions.mod")), 744, 9, const_cast<void*> (reinterpret_cast<const void*>("protection")), const_cast<void*> (reinterpret_cast<const void*>("protection exception")));
RTExceptions_Raise ( ((unsigned int) (M2EXCEPTION_protException)), const_cast<void*> (reinterpret_cast<const void*>("../../gcc/m2/gm2-libs/RTExceptions.mod")), 745, 9, const_cast<void*> (reinterpret_cast<const void*>("protection")), const_cast<void*> (reinterpret_cast<const void*>("protection exception")));
}
@ -842,7 +844,7 @@ static void protection (void * a)
static void systemf (void * a)
{
RTExceptions_Raise ( ((unsigned int) (M2EXCEPTION_sysException)), const_cast<void*> (reinterpret_cast<const void*>("../../gcc-read-write/gcc/m2/gm2-libs/RTExceptions.mod")), 756, 9, const_cast<void*> (reinterpret_cast<const void*>("systemf")), const_cast<void*> (reinterpret_cast<const void*>("system exception")));
RTExceptions_Raise ( ((unsigned int) (M2EXCEPTION_sysException)), const_cast<void*> (reinterpret_cast<const void*>("../../gcc/m2/gm2-libs/RTExceptions.mod")), 757, 9, const_cast<void*> (reinterpret_cast<const void*>("systemf")), const_cast<void*> (reinterpret_cast<const void*>("system exception")));
}
@ -852,7 +854,7 @@ static void systemf (void * a)
static void coroutine (void * a)
{
RTExceptions_Raise ( ((unsigned int) (M2EXCEPTION_coException)), const_cast<void*> (reinterpret_cast<const void*>("../../gcc-read-write/gcc/m2/gm2-libs/RTExceptions.mod")), 768, 9, const_cast<void*> (reinterpret_cast<const void*>("coroutine")), const_cast<void*> (reinterpret_cast<const void*>("coroutine exception")));
RTExceptions_Raise ( ((unsigned int) (M2EXCEPTION_coException)), const_cast<void*> (reinterpret_cast<const void*>("../../gcc/m2/gm2-libs/RTExceptions.mod")), 769, 9, const_cast<void*> (reinterpret_cast<const void*>("coroutine")), const_cast<void*> (reinterpret_cast<const void*>("coroutine exception")));
}
@ -862,7 +864,7 @@ static void coroutine (void * a)
static void exception (void * a)
{
RTExceptions_Raise ( ((unsigned int) (M2EXCEPTION_exException)), const_cast<void*> (reinterpret_cast<const void*>("../../gcc-read-write/gcc/m2/gm2-libs/RTExceptions.mod")), 780, 9, const_cast<void*> (reinterpret_cast<const void*>("exception")), const_cast<void*> (reinterpret_cast<const void*>("exception exception")));
RTExceptions_Raise ( ((unsigned int) (M2EXCEPTION_exException)), const_cast<void*> (reinterpret_cast<const void*>("../../gcc/m2/gm2-libs/RTExceptions.mod")), 781, 9, const_cast<void*> (reinterpret_cast<const void*>("exception")), const_cast<void*> (reinterpret_cast<const void*>("exception exception")));
}
@ -1181,13 +1183,13 @@ extern "C" RTExceptions_EHBlock RTExceptions_GetBaseExceptionBlock (void)
{
if (currentEHB == NULL)
{
M2RTS_Halt ((const char *) "../../gcc-read-write/gcc/m2/gm2-libs/RTExceptions.mod", 53, 598, (const char *) "GetBaseExceptionBlock", 21, (const char *) "currentEHB has not been initialized yet", 39);
M2RTS_Halt ((const char *) "../../gcc/m2/gm2-libs/RTExceptions.mod", 38, 599, (const char *) "GetBaseExceptionBlock", 21, (const char *) "currentEHB has not been initialized yet", 39);
}
else
{
return currentEHB;
}
ReturnException ("../../gcc-read-write/gcc/m2/gm2-libs/RTExceptions.def", 25, 1);
ReturnException ("../../gcc/m2/gm2-libs/RTExceptions.def", 25, 1);
__builtin_unreachable ();
}
@ -1218,7 +1220,7 @@ extern "C" void _M2_RTExceptions_init (__attribute__((unused)) int argc,__attrib
Init ();
}
extern "C" void _M2_RTExceptions_finish (__attribute__((unused)) int argc,__attribute__((unused)) char *argv[],__attribute__((unused)) char *envp[])
extern "C" void _M2_RTExceptions_fini (__attribute__((unused)) int argc,__attribute__((unused)) char *argv[],__attribute__((unused)) char *envp[])
{
TidyUp ();
}

2
gcc/m2/pge-boot/GSFIO.c
View file

@ -210,6 +210,6 @@ extern "C" void _M2_SFIO_init (__attribute__((unused)) int argc,__attribute__((u
{
}
extern "C" void _M2_SFIO_finish (__attribute__((unused)) int argc,__attribute__((unused)) char *argv[],__attribute__((unused)) char *envp[])
extern "C" void _M2_SFIO_fini (__attribute__((unused)) int argc,__attribute__((unused)) char *argv[],__attribute__((unused)) char *envp[])
{
}

6
gcc/m2/pge-boot/GStdIO.c
View file

@ -191,7 +191,7 @@ extern "C" StdIO_ProcWrite StdIO_GetCurrentOutput (void)
M2RTS_HALT (-1);
__builtin_unreachable ();
}
ReturnException ("../../gcc-read-write/gcc/m2/gm2-libs/StdIO.def", 25, 1);
ReturnException ("../../gcc/m2/gm2-libs/StdIO.def", 25, 1);
__builtin_unreachable ();
}
@ -250,7 +250,7 @@ extern "C" StdIO_ProcRead StdIO_GetCurrentInput (void)
M2RTS_HALT (-1);
__builtin_unreachable ();
}
ReturnException ("../../gcc-read-write/gcc/m2/gm2-libs/StdIO.def", 25, 1);
ReturnException ("../../gcc/m2/gm2-libs/StdIO.def", 25, 1);
__builtin_unreachable ();
}
@ -262,6 +262,6 @@ extern "C" void _M2_StdIO_init (__attribute__((unused)) int argc,__attribute__((
StdIO_PushInput ((StdIO_ProcRead) {(StdIO_ProcRead_t) IO_Read});
}
extern "C" void _M2_StdIO_finish (__attribute__((unused)) int argc,__attribute__((unused)) char *argv[],__attribute__((unused)) char *envp[])
extern "C" void _M2_StdIO_fini (__attribute__((unused)) int argc,__attribute__((unused)) char *argv[],__attribute__((unused)) char *envp[])
{
}

2
gcc/m2/pge-boot/GStorage.c
View file

@ -67,6 +67,6 @@ extern "C" void _M2_Storage_init (__attribute__((unused)) int argc,__attribute__
{
}
extern "C" void _M2_Storage_finish (__attribute__((unused)) int argc,__attribute__((unused)) char *argv[],__attribute__((unused)) char *envp[])
extern "C" void _M2_Storage_fini (__attribute__((unused)) int argc,__attribute__((unused)) char *argv[],__attribute__((unused)) char *envp[])
{
}

2
gcc/m2/pge-boot/GStrCase.c
View file

@ -170,6 +170,6 @@ extern "C" void _M2_StrCase_init (__attribute__((unused)) int argc,__attribute__
{
}
extern "C" void _M2_StrCase_finish (__attribute__((unused)) int argc,__attribute__((unused)) char *argv[],__attribute__((unused)) char *envp[])
extern "C" void _M2_StrCase_fini (__attribute__((unused)) int argc,__attribute__((unused)) char *argv[],__attribute__((unused)) char *envp[])
{
}

2
gcc/m2/pge-boot/GStrIO.c
View file

@ -272,6 +272,6 @@ extern "C" void _M2_StrIO_init (__attribute__((unused)) int argc,__attribute__((
IsATTY = FALSE;
}
extern "C" void _M2_StrIO_finish (__attribute__((unused)) int argc,__attribute__((unused)) char *argv[],__attribute__((unused)) char *envp[])
extern "C" void _M2_StrIO_fini (__attribute__((unused)) int argc,__attribute__((unused)) char *argv[],__attribute__((unused)) char *envp[])
{
}

2
gcc/m2/pge-boot/GStrLib.c
View file

@ -341,6 +341,6 @@ extern "C" void _M2_StrLib_init (__attribute__((unused)) int argc,__attribute__(
{
}
extern "C" void _M2_StrLib_finish (__attribute__((unused)) int argc,__attribute__((unused)) char *argv[],__attribute__((unused)) char *envp[])
extern "C" void _M2_StrLib_fini (__attribute__((unused)) int argc,__attribute__((unused)) char *argv[],__attribute__((unused)) char *envp[])
{
}

8
gcc/m2/pge-boot/GSymbolKey.c
View file

@ -183,7 +183,7 @@ static void FindNodeParentInTree (SymbolKey_SymbolTree t, NameKey_Name n, Symbol
(*parent) = t;
if (t == NULL)
{
Debug_Halt ((const char *) "parameter t should never be NIL", 31, 240, (const char *) "../../gcc-read-write/gcc/m2/gm2-compiler/SymbolKey.mod", 54);
Debug_Halt ((const char *) "parameter t should never be NIL", 31, 240, (const char *) "../../gcc/m2/gm2-compiler/SymbolKey.mod", 39);
}
Assertion_Assert (t->Right == NULL);
(*child) = t->Left;
@ -392,7 +392,7 @@ extern "C" void SymbolKey_PutSymKey (SymbolKey_SymbolTree t, NameKey_Name NameKe
}
else
{
Debug_Halt ((const char *) "symbol already stored", 21, 156, (const char *) "../../gcc-read-write/gcc/m2/gm2-compiler/SymbolKey.mod", 54);
Debug_Halt ((const char *) "symbol already stored", 21, 156, (const char *) "../../gcc/m2/gm2-compiler/SymbolKey.mod", 39);
}
}
@ -459,7 +459,7 @@ extern "C" void SymbolKey_DelSymKey (SymbolKey_SymbolTree t, NameKey_Name NameKe
}
else
{
Debug_Halt ((const char *) "trying to delete a symbol that is not in the tree - the compiler never expects this to occur", 92, 223, (const char *) "../../gcc-read-write/gcc/m2/gm2-compiler/SymbolKey.mod", 54);
Debug_Halt ((const char *) "trying to delete a symbol that is not in the tree - the compiler never expects this to occur", 92, 223, (const char *) "../../gcc/m2/gm2-compiler/SymbolKey.mod", 39);
}
}
@ -551,6 +551,6 @@ extern "C" void _M2_SymbolKey_init (__attribute__((unused)) int argc,__attribute
{
}
extern "C" void _M2_SymbolKey_finish (__attribute__((unused)) int argc,__attribute__((unused)) char *argv[],__attribute__((unused)) char *envp[])
extern "C" void _M2_SymbolKey_fini (__attribute__((unused)) int argc,__attribute__((unused)) char *argv[],__attribute__((unused)) char *envp[])
{
}

2
gcc/m2/pge-boot/GSysExceptions.c
View file

@ -232,6 +232,6 @@ _M2_SysExceptions_init (void)
EXTERN
void
_M2_SysExceptions_finish (void)
_M2_SysExceptions_fini (void)
{
}

8
gcc/m2/pge-boot/GSysStorage.c
View file

@ -93,7 +93,7 @@ extern "C" void SysStorage_ALLOCATE (void * *a, unsigned int size)
(*a) = libc_malloc (static_cast<size_t> (size));
if ((*a) == NULL)
{
Debug_Halt ((const char *) "out of memory error", 19, 50, (const char *) "../../gcc-read-write/gcc/m2/gm2-libs/SysStorage.mod", 51);
Debug_Halt ((const char *) "out of memory error", 19, 50, (const char *) "../../gcc/m2/gm2-libs/SysStorage.mod", 36);
}
if (enableTrace && trace)
{
@ -118,7 +118,7 @@ extern "C" void SysStorage_DEALLOCATE (void * *a, unsigned int size)
}
if ((libc_memset ((*a), 0, static_cast<size_t> (size))) != (*a))
{
Debug_Halt ((const char *) "memset should have returned the first parameter", 47, 76, (const char *) "../../gcc-read-write/gcc/m2/gm2-libs/SysStorage.mod", 51);
Debug_Halt ((const char *) "memset should have returned the first parameter", 47, 76, (const char *) "../../gcc/m2/gm2-libs/SysStorage.mod", 36);
}
}
if (enableDeallocation)
@ -163,7 +163,7 @@ extern "C" void SysStorage_REALLOCATE (void * *a, unsigned int size)
(*a) = libc_realloc ((*a), static_cast<size_t> (size));
if ((*a) == NULL)
{
Debug_Halt ((const char *) "out of memory error", 19, 119, (const char *) "../../gcc-read-write/gcc/m2/gm2-libs/SysStorage.mod", 51);
Debug_Halt ((const char *) "out of memory error", 19, 119, (const char *) "../../gcc/m2/gm2-libs/SysStorage.mod", 36);
}
if (enableTrace && trace)
{
@ -244,6 +244,6 @@ extern "C" void _M2_SysStorage_init (__attribute__((unused)) int argc,__attribut
}
}
extern "C" void _M2_SysStorage_finish (__attribute__((unused)) int argc,__attribute__((unused)) char *argv[],__attribute__((unused)) char *envp[])
extern "C" void _M2_SysStorage_fini (__attribute__((unused)) int argc,__attribute__((unused)) char *argv[],__attribute__((unused)) char *envp[])
{
}

4
gcc/m2/pge-boot/GUnixArgs.cc
View file

@ -73,7 +73,7 @@ _M2_UnixArgs_init (int argc, char *argv[], char *envp[])
}
extern "C" void
_M2_UnixArgs_finish (int argc, char *argv[], char *envp[])
_M2_UnixArgs_fini (int argc, char *argv[], char *envp[])
{
}
@ -86,6 +86,6 @@ struct _M2_UnixArgs_ctor { _M2_UnixArgs_ctor (); } _M2_UnixArgs_ctor;
_M2_UnixArgs_ctor::_M2_UnixArgs_ctor (void)
{
M2RTS_RegisterModule ("UnixArgs", _M2_UnixArgs_init, _M2_UnixArgs_finish,
M2RTS_RegisterModule ("UnixArgs", _M2_UnixArgs_init, _M2_UnixArgs_fini,
_M2_UnixArgs_dep);
}

2
gcc/m2/pge-boot/Gbnflex.c
View file

@ -597,6 +597,6 @@ extern "C" void _M2_bnflex_init (__attribute__((unused)) int argc,__attribute__(
Init ();
}
extern "C" void _M2_bnflex_finish (__attribute__((unused)) int argc,__attribute__((unused)) char *argv[],__attribute__((unused)) char *envp[])
extern "C" void _M2_bnflex_fini (__attribute__((unused)) int argc,__attribute__((unused)) char *argv[],__attribute__((unused)) char *envp[])
{
}

2
gcc/m2/pge-boot/Gerrno.c
View file

@ -45,7 +45,7 @@ _M2_errno_init (int argc, char *p)
/* finish deconstructor for the module. */
void
_M2_errno_finish (int argc, char *p)
_M2_errno_fini (int argc, char *p)
{
}

37
gcc/m2/pge-boot/Glibc.c
View file

@ -115,6 +115,43 @@ libc_printf (char *_format, unsigned int _format_high, ...)
return done;
}
EXTERN
int
libc_snprintf (char *dest, size_t length, char *_format, unsigned int _format_high, ...)
{
va_list arg;
int done;
char format[_format_high + 1];
unsigned int i = 0;
unsigned int j = 0;
char *c;
do
{
c = index (&_format[i], '\\');
if (c == NULL)
strcpy (&format[j], &_format[i]);
else
{
memcpy (&format[j], &_format[i], (c - _format) - i);
i = c - _format;
j += c - _format;
if (_format[i + 1] == 'n')
format[j] = '\n';
else
format[j] = _format[i + 1];
j++;
i += 2;
}
}
while (c != NULL);
va_start (arg, _format_high);
done = vsnprintf (dest, length, format, arg);
va_end (arg);
return done;
}
EXTERN
void *
libc_malloc (unsigned int size)

1
gcc/m2/pge-boot/Glibc.h
View file

@ -305,6 +305,7 @@ EXTERN void * libc_memset (void * s, int c, size_t size);
EXTERN void * libc_memmove (void * dest, void * src, size_t size);
EXTERN int libc_printf (const char *format_, unsigned int _format_high, ...);
EXTERN int libc_snprintf (void *dest, size_t length, const char *format_, unsigned int _format_high, ...);
/*
setenv - sets environment variable, name, to value.

2
gcc/m2/pge-boot/Gpge.c
View file

@ -9748,6 +9748,6 @@ extern "C" void _M2_pge_init (__attribute__((unused)) int argc,__attribute__((un
Init ();
}
extern "C" void _M2_pge_finish (__attribute__((unused)) int argc,__attribute__((unused)) char *argv[],__attribute__((unused)) char *envp[])
extern "C" void _M2_pge_fini (__attribute__((unused)) int argc,__attribute__((unused)) char *argv[],__attribute__((unused)) char *envp[])
{
}

Some files were not shown because too many files have changed in this diff Show more