[M3commit] CVS Update: cm3
Jay K
jay.krell at cornell.edu
Fri Oct 12 09:07:19 CEST 2012
a few of the recent diffs:
Index: m3core/src/m3core.h===================================================================RCS file: /usr/cvs/cm3/m3-libs/m3core/src/m3core.h,vretrieving revision 1.76diff -r1.76 m3core.h154,157c154,160< #define M3EXTERNC_BEGIN extern "C" {< #define M3_EXTERNC_BEGIN extern "C" {< #define M3EXTERNC_END }< #define M3_EXTERNC_END }---> #define M3_EXTERN_C extern "C"> #define M3_EXTERN_C_BEGIN extern "C" {> #define M3_EXTERN_C_END }> #define M3EXTERNC_BEGIN extern "C" {> #define M3_EXTERNC_BEGIN extern "C" {> #define M3EXTERNC_END }> #define M3_EXTERNC_END }159,162c162,166< #define M3EXTERNC_BEGIN /* nothing */< #define M3_EXTERNC_BEGIN /* nothing */< #define M3EXTERNC_END /* nothing */< #define M3_EXTERNC_END /* nothing */---> #define M3_EXTERN_C /* nothing */> #define M3EXTERNC_BEGIN /* nothing */> #define M3_EXTERNC_BEGIN /* nothing */> #define M3EXTERNC_END /* nothing */> #define M3_EXTERNC_END /* nothing */Index: m3core/src/float/C99/FloatModeC.c===================================================================RCS file: /usr/cvs/cm3/m3-libs/m3core/src/float/C99/FloatModeC.c,vretrieving revision 1.1diff -r1.1 FloatModeC.c23a24,27> #ifdef __cplusplus> extern "C" {> #endif> 56c60< we cant do that here so we have to wrap them ... */---> we cannot do that here so we have to wrap them. */71a76,79> > #ifdef __cplusplus> } /* extern "C" */> #endifIndex: m3core/src/runtime/common/RTLinker.i3===================================================================RCS file: /usr/cvs/cm3/m3-libs/m3core/src/runtime/common/RTLinker.i3,vretrieving revision 1.6diff -r1.6 RTLinker.i345a46,52> <*EXTERNAL RTLinker__PrintString*> PROCEDURE PrintString (a : ADDRESS);> <*EXTERNAL RTLinker__PrintText*> PROCEDURE PrintText(a : TEXT);> <*EXTERNAL RTLinker__PrintInt*> PROCEDURE PrintInt(a : INTEGER);> <*EXTERNAL RTLinker__PrintModule*> PROCEDURE PrintModule(a : ADDRESS);> (* TYPE Trace_t = { None, M3, C };> <*EXTERNAL RTLinker__traceInit*> VAR traceInit : Trace_t; *)> Index: m3core/src/runtime/common/RTLinker.m3===================================================================RCS file: /usr/cvs/cm3/m3-libs/m3core/src/runtime/common/RTLinker.m3,vretrieving revision 1.21diff -r1.21 RTLinker.m340a41,42> (* PrintModule(RTLinkerX.RTHooks_M3(0)); *)> Index: m3core/src/runtime/common/RTLinkerC.c===================================================================RCS file: /usr/cvs/cm3/m3-libs/m3core/src/runtime/common/RTLinkerC.c,vretrieving revision 1.14diff -r1.14 RTLinkerC.c24a25,188> #if 1 /* debugging code */> > /*> see RT0.i3 for the types here> It would be good for the Modula-3 compiler to generate C headers.> */> > #include <stdio.h>> > struct ModuleInfo_t; typedef struct ModuleInfo_t ModuleInfo_t;> struct ImportInfo_t; typedef struct ImportInfo_t ImportInfo_t;> #if 0> struct Text_t; typedef struct Text_t Text_t;> #endif> > struct ImportInfo_t> {> ModuleInfo_t* Import;> void* Binder; /* returns "import" pointer */> ImportInfo_t* Next;> };> > struct ModuleInfo_t> {> const char* File; /* 0 */> void* TypeCells; /* 4 8 */> void* TypeCellPointers; /* 8 16 */> void* FullRevelation; /* 12 24 */> void* PartialRevelation; /* 16 32 */> void* ProcedureInformation; /* 20 40 */> void* TryScopes; /* 24 48 */> void* VariableMap; /* 28 56 */> void* GarbageCollectionMap; /* 32 64 */> ImportInfo_t* Imports; /* 36 72 */> size_t LinkState; /* 40 80 */> void* Binder; /* 44 88 */> size_t GarbageCollectionFlags; /* 48 96 */> };> > #if 0> struct Text_t> {> void* Functions;> ptrdiff_t Length;> char Chars[1];> };> #endif> > #if 0> #define traceInit RTLinker__traceInit> enum Trace_t> {> Trace_None,> Trace_M3,> Trace_C,> };> size_t traceInit /* = Trace_C */;> > void> RTIO__PutString(const char* a);> > void> RTIO__PutText(Text_t* a);> > void> RTIO__PutInt(int a);> > static> void> RTIO__Flush(void);> > static> void> RTLinker__PrintFlush(void)> {> if (traceInit == Trace_M3)> RTIO__Flush();> }> > static> void> RTLinker__PrintString(const char* a)> {> if (a == NULL || a[0] == 0)> return;> switch (traceInit)> {> case Trace_None:> break;> case Trace_M3:> RTIO__PutString(a);> break;> case Trace_C:> printf("%s", a);> break;> }> }> > static> void> RTLinker__PrintText(Text_t* a)> {> if (a == NULL || a->Length < 1)> return;> switch (traceInit)> {> case Trace_None:> break;> case Trace_M3:> RTIO__PutText(a);> break;> case Trace_C:> printf("%.*s", ((int)a->Length), a->Chars);> break;> }> }> > static> void> RTLinker__PrintInt(int a)> {> switch (traceInit)> {> case Trace_None:> break;> case Trace_M3:> RTIO__PutInt(a);> break;> case Trace_C:> printf("%X", a);> break;> }> }> > #endif> > void> RTLinker__PrintModule(ModuleInfo_t* Module)> {> ImportInfo_t* Imports = { 0 };> > if ((Module == NULL) /*|| (traceInit != Trace_C)*/)> return;> Imports = Module->Imports;> while (Imports != NULL)> {> printf("Module %p %s Imports %p{Import %p, Binder %p, Next %p}",> Module,> Module->File,> Imports,> (Imports ? Imports->Import : NULL),> (Imports ? Imports->Binder : NULL),> (Imports ? Imports->Next : NULL));> fflush(0);> printf(" %p ", Imports && Imports->Import ? Imports->Import->File : "");> fflush(0);> printf(" %s\n", Imports && Imports->Import ? Imports->Import->File : "");> Imports = Imports->Next;> }> printf("\n");> }> > #endif> Index: m3core/src/thread/Common/ThreadInternal.c===================================================================RCS file: /usr/cvs/cm3/m3-libs/m3core/src/thread/Common/ThreadInternal.c,vretrieving revision 1.15diff -r1.15 ThreadInternal.c84c84< return select(nfds, read, write, xcept, NULL);---> return select(nfds, (fd_set*)read, (fd_set*)write, (fd_set*)xcept, NULL);89c89< return select(nfds, read, write, xcept, &timeout);---> return select(nfds, (fd_set*)read, (fd_set*)write, (fd_set*)xcept, &timeout);Index: m3core/src/thread/PTHREAD/ThreadPThreadC.c===================================================================RCS file: /usr/cvs/cm3/m3-libs/m3core/src/thread/PTHREAD/ThreadPThreadC.c,vretrieving revision 1.164diff -r1.164 ThreadPThreadC.c243c243< pthread_mutex_t * const ThreadPThread__##name##Mu = &name##Mu; \---> extern pthread_mutex_t * const ThreadPThread__##name##Mu = &name##Mu; \247c247< pthread_cond_t * const ThreadPThread__##name##Cond = &name##Cond; \---> extern pthread_cond_t * const ThreadPThread__##name##Cond = &name##Cond; \Index: libm3/src/list/ListSort.ig===================================================================RCS file: /usr/cvs/cm3/m3-libs/libm3/src/list/ListSort.ig,vretrieving revision 1.1.1.1diff -r1.1.1.1 ListSort.ig42d41<
> Date: Fri, 12 Oct 2012 09:04:58 +0000
> To: m3commit at elegosoft.com
> From: jkrell at elego.de
> Subject: [M3commit] CVS Update: cm3
>
> CVSROOT: /usr/cvs
> Changes by: jkrell at birch. 12/10/12 09:04:58
>
> Modified files:
> cm3/m3-libs/m3core/src/runtime/common/: RTLinker.i3 RTLinker.m3
> RTLinkerC.c
>
> Log message:
> restore-but-it-is-disabled some debugging assistance code
> it has proven very useful multiple times
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://m3lists.elegosoft.com/pipermail/m3commit/attachments/20121012/075575c8/attachment-0002.html>
More information about the M3commit
mailing list