PR-108135 Modula2 meets clang (remove dead code and bugfix m2.flex)
These patches fix warnings (and a bug) discovered by clang. The
patch set looks longer than the changes as pge and mc needed to be
rebuilt (due to a change in the gcc/m2/gm2-libs/DynamicString.mod
library).
gcc/m2/ChangeLog:
* gm2-gcc/m2statement.cc (gm2_gimplify_function_node):
Remove.
* gm2-libs/DynamicStrings.mod (Equal): Remove dead code.
* m2.flex (<COMMENT>"<*"): Add {} for else statement.
* m2pp.cc (hextree): Add conditional #ifdef DEBUGGING.
* mc-boot/GDynamicStrings.c: Rebuild.
* pge-boot/GDynamicStrings.c: Rebuild.
* pge-boot/GFIO.c: Rebuild.
* pge-boot/GIndexing.c: Rebuild.
* pge-boot/GM2EXCEPTION.c: Rebuild.
* pge-boot/GM2RTS.c: Rebuild.
* pge-boot/GNameKey.c: Rebuild.
* pge-boot/GPushBackInput.c: Rebuild.
* pge-boot/GRTExceptions.c: Rebuild.
* pge-boot/GStdIO.c: Rebuild.
* pge-boot/GSymbolKey.c: Rebuild.
* pge-boot/GSysStorage.c: Rebuild.
Signed-off-by: Gaius Mulley <gaiusmod2@gmail.com>
This commit is contained in:
Gaius Mulley
parent
99ea0d7611
commit
f71354f7b9
16 changed files with 164 additions and 131 deletions
|
|
@ -84,23 +84,6 @@ m2statement_BuildStartFunctionCode (location_t location, tree fndecl,
|
|||
DECL_DECLARED_INLINE_P (fndecl) = 0; /* isinline; */
|
||||
}
|
||||
|
||||
static void
|
||||
gm2_gimplify_function_node (tree fndecl)
|
||||
{
|
||||
/* Convert all nested functions to GIMPLE now. We do things in this
|
||||
order so that items like VLA sizes are expanded properly in the
|
||||
context of the correct function. */
|
||||
struct cgraph_node *cgn;
|
||||
|
||||
dump_function (TDI_original, fndecl);
|
||||
gimplify_function_tree (fndecl);
|
||||
|
||||
cgn = cgraph_node::get_create (fndecl);
|
||||
for (cgn = first_nested_function (cgn);
|
||||
cgn != NULL; cgn = next_nested_function (cgn))
|
||||
gm2_gimplify_function_node (cgn->decl);
|
||||
}
|
||||
|
||||
/* BuildEndFunctionCode - generates the function epilogue. */
|
||||
|
||||
void
|
||||
|
|
|
|||
|
|
@ -1215,14 +1215,6 @@ BEGIN
|
|||
i := 0 ;
|
||||
Assert (a^.contents.len = b^.contents.len) ;
|
||||
WHILE i<a^.contents.len DO
|
||||
IF a^.contents.buf[i] # a^.contents.buf[i]
|
||||
THEN
|
||||
HALT
|
||||
END ;
|
||||
IF b^.contents.buf[i] # b^.contents.buf[i]
|
||||
THEN
|
||||
HALT
|
||||
END ;
|
||||
IF a^.contents.buf[i] # b^.contents.buf[i]
|
||||
THEN
|
||||
RETURN FALSE
|
||||
|
|
|
|||
|
|
@ -131,8 +131,9 @@ extern void yylex (void);
|
|||
pushLine();
|
||||
skippos();
|
||||
BEGIN COMMENT1;
|
||||
} else
|
||||
} else {
|
||||
updatepos(); skippos();
|
||||
}
|
||||
}
|
||||
<COMMENT>\n.* { consumeLine(); }
|
||||
<COMMENT>. { updatepos(); skippos(); }
|
||||
|
|
|
|||
|
|
@ -547,6 +547,7 @@ m2pp_types (pretty *s)
|
|||
}
|
||||
}
|
||||
|
||||
#ifdef DEBUGGING
|
||||
/* hextree displays the critical fields for function, block and
|
||||
bind_expr trees in raw hex. */
|
||||
|
||||
|
|
@ -607,6 +608,7 @@ hextree (tree t)
|
|||
killPretty (state);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
/* translation produce a pseudo implementation module from the tree t. */
|
||||
|
||||
|
|
|
|||
|
|
@ -1874,16 +1874,6 @@ extern "C" unsigned int DynamicStrings_Equal (DynamicStrings_String a, DynamicSt
|
|||
Assertion_Assert (a->contents.len == b->contents.len);
|
||||
while (i < a->contents.len)
|
||||
{
|
||||
if (a->contents.buf.array[i] != a->contents.buf.array[i])
|
||||
{
|
||||
M2RTS_HALT (-1);
|
||||
__builtin_unreachable ();
|
||||
}
|
||||
if (b->contents.buf.array[i] != b->contents.buf.array[i])
|
||||
{
|
||||
M2RTS_HALT (-1);
|
||||
__builtin_unreachable ();
|
||||
}
|
||||
if (a->contents.buf.array[i] != b->contents.buf.array[i])
|
||||
{
|
||||
return FALSE;
|
||||
|
|
@ -1920,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, 1258, (const char *) "EqualCharStar", 13);
|
||||
t = AssignDebug (t, (const char *) "../../gcc-read-write/gcc/m2/gm2-libs/DynamicStrings.mod", 55, 1250, (const char *) "EqualCharStar", 13);
|
||||
}
|
||||
t = AddToGarbage (t, s);
|
||||
if (DynamicStrings_Equal (t, s))
|
||||
|
|
@ -1958,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, 1288, (const char *) "EqualArray", 10);
|
||||
t = AssignDebug (t, (const char *) "../../gcc-read-write/gcc/m2/gm2-libs/DynamicStrings.mod", 55, 1280, (const char *) "EqualArray", 10);
|
||||
}
|
||||
t = AddToGarbage (t, s);
|
||||
if (DynamicStrings_Equal (t, s))
|
||||
|
|
@ -1996,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, 1320, (const char *) "Mult", 4);
|
||||
s = AssignDebug (s, (const char *) "../../gcc-read-write/gcc/m2/gm2-libs/DynamicStrings.mod", 55, 1312, (const char *) "Mult", 4);
|
||||
}
|
||||
return s;
|
||||
/* static analysis guarentees a RETURN statement will be used before here. */
|
||||
|
|
@ -2075,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, 1388, (const char *) "Slice", 5);
|
||||
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 = t->contents.next;
|
||||
|
|
@ -2093,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, 1405, (const char *) "Slice", 5);
|
||||
d = AssignDebug (d, (const char *) "../../gcc-read-write/gcc/m2/gm2-libs/DynamicStrings.mod", 55, 1397, (const char *) "Slice", 5);
|
||||
}
|
||||
return d;
|
||||
/* static analysis guarentees a RETURN statement will be used before here. */
|
||||
|
|
@ -2221,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, 1517, (const char *) "RemoveComment", 13);
|
||||
s = AssignDebug (s, (const char *) "../../gcc-read-write/gcc/m2/gm2-libs/DynamicStrings.mod", 55, 1509, (const char *) "RemoveComment", 13);
|
||||
}
|
||||
return s;
|
||||
/* static analysis guarentees a RETURN statement will be used before here. */
|
||||
|
|
@ -2246,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, 1629, (const char *) "RemoveWhitePrefix", 17);
|
||||
s = AssignDebug (s, (const char *) "../../gcc-read-write/gcc/m2/gm2-libs/DynamicStrings.mod", 55, 1621, (const char *) "RemoveWhitePrefix", 17);
|
||||
}
|
||||
return s;
|
||||
/* static analysis guarentees a RETURN statement will be used before here. */
|
||||
|
|
@ -2271,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, 1651, (const char *) "RemoveWhitePostfix", 18);
|
||||
s = AssignDebug (s, (const char *) "../../gcc-read-write/gcc/m2/gm2-libs/DynamicStrings.mod", 55, 1643, (const char *) "RemoveWhitePostfix", 18);
|
||||
}
|
||||
return s;
|
||||
/* static analysis guarentees a RETURN statement will be used before here. */
|
||||
|
|
|
|||
|
|
@ -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-git-devel-modula2/gcc/m2/gm2-libs/DynamicStrings.mod", 62, 722, (const char *) "ConcatContents", 14);
|
||||
(*c).next = AssignDebug ((*c).next, (const char *) "../../gcc-read-write/gcc/m2/gm2-libs/DynamicStrings.mod", 55, 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-git-devel-modula2/gcc/m2/gm2-libs/DynamicStrings.mod", 62, 917, (const char *) "ConcatContentsAddress", 21);
|
||||
(*c).next = AssignDebug ((*c).next, (const char *) "../../gcc-read-write/gcc/m2/gm2-libs/DynamicStrings.mod", 55, 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-git-devel-modula2/gcc/m2/gm2-libs/DynamicStrings.mod", 62, 758, (const char *) "InitString", 10);
|
||||
s = AssignDebug (s, (const char *) "../../gcc-read-write/gcc/m2/gm2-libs/DynamicStrings.mod", 55, 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-git-devel-modula2/gcc/m2/gm2-libs/DynamicStrings.mod", 62, 957, (const char *) "InitStringCharStar", 18);
|
||||
s = AssignDebug (s, (const char *) "../../gcc-read-write/gcc/m2/gm2-libs/DynamicStrings.mod", 55, 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-git-devel-modula2/gcc/m2/gm2-libs/DynamicStrings.mod", 62, 977, (const char *) "InitStringChar", 14);
|
||||
s = AssignDebug (s, (const char *) "../../gcc-read-write/gcc/m2/gm2-libs/DynamicStrings.mod", 55, 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-git-devel-modula2/gcc/m2/gm2-libs/DynamicStrings.mod", 62, 1173, (const char *) "Dup", 3);
|
||||
s = AssignDebug (s, (const char *) "../../gcc-read-write/gcc/m2/gm2-libs/DynamicStrings.mod", 55, 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-git-devel-modula2/gcc/m2/gm2-libs/DynamicStrings.mod", 62, 1193, (const char *) "Add", 3);
|
||||
a = AssignDebug (a, (const char *) "../../gcc-read-write/gcc/m2/gm2-libs/DynamicStrings.mod", 55, 1193, (const char *) "Add", 3);
|
||||
}
|
||||
return a;
|
||||
/* static analysis guarentees a RETURN statement will be used before here. */
|
||||
|
|
@ -1877,16 +1877,6 @@ extern "C" unsigned int DynamicStrings_Equal (DynamicStrings_String a, DynamicSt
|
|||
Assertion_Assert (a->contents.len == b->contents.len);
|
||||
while (i < a->contents.len)
|
||||
{
|
||||
if (a->contents.buf.array[i] != a->contents.buf.array[i])
|
||||
{
|
||||
M2RTS_HALT (-1);
|
||||
__builtin_unreachable ();
|
||||
}
|
||||
if (b->contents.buf.array[i] != b->contents.buf.array[i])
|
||||
{
|
||||
M2RTS_HALT (-1);
|
||||
__builtin_unreachable ();
|
||||
}
|
||||
if (a->contents.buf.array[i] != b->contents.buf.array[i])
|
||||
{
|
||||
return FALSE;
|
||||
|
|
@ -1923,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-git-devel-modula2/gcc/m2/gm2-libs/DynamicStrings.mod", 62, 1258, (const char *) "EqualCharStar", 13);
|
||||
t = AssignDebug (t, (const char *) "../../gcc-read-write/gcc/m2/gm2-libs/DynamicStrings.mod", 55, 1250, (const char *) "EqualCharStar", 13);
|
||||
}
|
||||
t = AddToGarbage (t, s);
|
||||
if (DynamicStrings_Equal (t, s))
|
||||
|
|
@ -1961,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-git-devel-modula2/gcc/m2/gm2-libs/DynamicStrings.mod", 62, 1288, (const char *) "EqualArray", 10);
|
||||
t = AssignDebug (t, (const char *) "../../gcc-read-write/gcc/m2/gm2-libs/DynamicStrings.mod", 55, 1280, (const char *) "EqualArray", 10);
|
||||
}
|
||||
t = AddToGarbage (t, s);
|
||||
if (DynamicStrings_Equal (t, s))
|
||||
|
|
@ -1999,7 +1989,7 @@ extern "C" DynamicStrings_String DynamicStrings_Mult (DynamicStrings_String s, u
|
|||
}
|
||||
if (TraceOn)
|
||||
{
|
||||
s = AssignDebug (s, (const char *) "../../gcc-git-devel-modula2/gcc/m2/gm2-libs/DynamicStrings.mod", 62, 1320, (const char *) "Mult", 4);
|
||||
s = AssignDebug (s, (const char *) "../../gcc-read-write/gcc/m2/gm2-libs/DynamicStrings.mod", 55, 1312, (const char *) "Mult", 4);
|
||||
}
|
||||
return s;
|
||||
/* static analysis guarentees a RETURN statement will be used before here. */
|
||||
|
|
@ -2078,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-git-devel-modula2/gcc/m2/gm2-libs/DynamicStrings.mod", 62, 1388, (const char *) "Slice", 5);
|
||||
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 = t->contents.next;
|
||||
|
|
@ -2096,7 +2086,7 @@ extern "C" DynamicStrings_String DynamicStrings_Slice (DynamicStrings_String s,
|
|||
}
|
||||
if (TraceOn)
|
||||
{
|
||||
d = AssignDebug (d, (const char *) "../../gcc-git-devel-modula2/gcc/m2/gm2-libs/DynamicStrings.mod", 62, 1405, (const char *) "Slice", 5);
|
||||
d = AssignDebug (d, (const char *) "../../gcc-read-write/gcc/m2/gm2-libs/DynamicStrings.mod", 55, 1397, (const char *) "Slice", 5);
|
||||
}
|
||||
return d;
|
||||
/* static analysis guarentees a RETURN statement will be used before here. */
|
||||
|
|
@ -2224,7 +2214,7 @@ extern "C" DynamicStrings_String DynamicStrings_RemoveComment (DynamicStrings_St
|
|||
}
|
||||
if (TraceOn)
|
||||
{
|
||||
s = AssignDebug (s, (const char *) "../../gcc-git-devel-modula2/gcc/m2/gm2-libs/DynamicStrings.mod", 62, 1517, (const char *) "RemoveComment", 13);
|
||||
s = AssignDebug (s, (const char *) "../../gcc-read-write/gcc/m2/gm2-libs/DynamicStrings.mod", 55, 1509, (const char *) "RemoveComment", 13);
|
||||
}
|
||||
return s;
|
||||
/* static analysis guarentees a RETURN statement will be used before here. */
|
||||
|
|
@ -2249,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-git-devel-modula2/gcc/m2/gm2-libs/DynamicStrings.mod", 62, 1629, (const char *) "RemoveWhitePrefix", 17);
|
||||
s = AssignDebug (s, (const char *) "../../gcc-read-write/gcc/m2/gm2-libs/DynamicStrings.mod", 55, 1621, (const char *) "RemoveWhitePrefix", 17);
|
||||
}
|
||||
return s;
|
||||
/* static analysis guarentees a RETURN statement will be used before here. */
|
||||
|
|
@ -2274,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-git-devel-modula2/gcc/m2/gm2-libs/DynamicStrings.mod", 62, 1651, (const char *) "RemoveWhitePostfix", 18);
|
||||
s = AssignDebug (s, (const char *) "../../gcc-read-write/gcc/m2/gm2-libs/DynamicStrings.mod", 55, 1643, (const char *) "RemoveWhitePostfix", 18);
|
||||
}
|
||||
return s;
|
||||
/* static analysis guarentees a RETURN statement will be used before here. */
|
||||
|
|
@ -2643,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-git-devel-modula2/gcc/m2/gm2-libs/DynamicStrings.mod", 62, 176, (const char *) "PopAllocationExemption", 22, (const char *) "mismatched number of PopAllocation's compared to PushAllocation's", 65);
|
||||
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);
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
|
|||
|
|
@ -558,7 +558,7 @@ static FIO_File GetNextFreeDescriptor (void)
|
|||
return f; /* create new slot */
|
||||
}
|
||||
}
|
||||
ReturnException ("../../gcc-git-devel-modula2/gcc/m2/gm2-libs/FIO.def", 25, 1);
|
||||
ReturnException ("../../gcc-read-write/gcc/m2/gm2-libs/FIO.def", 25, 1);
|
||||
__builtin_unreachable ();
|
||||
}
|
||||
|
||||
|
|
@ -2269,7 +2269,7 @@ extern "C" void * FIO_getFileName (FIO_File f)
|
|||
return fd->name.address;
|
||||
}
|
||||
}
|
||||
ReturnException ("../../gcc-git-devel-modula2/gcc/m2/gm2-libs/FIO.def", 25, 1);
|
||||
ReturnException ("../../gcc-read-write/gcc/m2/gm2-libs/FIO.def", 25, 1);
|
||||
__builtin_unreachable ();
|
||||
}
|
||||
|
||||
|
|
@ -2296,7 +2296,7 @@ extern "C" unsigned int FIO_getFileNameLength (FIO_File f)
|
|||
return fd->name.size;
|
||||
}
|
||||
}
|
||||
ReturnException ("../../gcc-git-devel-modula2/gcc/m2/gm2-libs/FIO.def", 25, 1);
|
||||
ReturnException ("../../gcc-read-write/gcc/m2/gm2-libs/FIO.def", 25, 1);
|
||||
__builtin_unreachable ();
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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-git-devel-modula2/gcc/m2/gm2-libs/Indexing.def", 25, 1);
|
||||
ReturnException ("../../gcc-read-write/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-git-devel-modula2/gcc/m2/gm2-libs/Indexing.def", 25, 1);
|
||||
ReturnException ("../../gcc-read-write/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-git-devel-modula2/gcc/m2/gm2-libs/Indexing.def", 25, 1);
|
||||
ReturnException ("../../gcc-read-write/gcc/m2/gm2-libs/Indexing.def", 25, 1);
|
||||
__builtin_unreachable ();
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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-git-devel-modula2/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-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")));
|
||||
}
|
||||
else
|
||||
{
|
||||
return (M2EXCEPTION_M2Exceptions) (n);
|
||||
}
|
||||
ReturnException ("../../gcc-git-devel-modula2/gcc/m2/gm2-libs/M2EXCEPTION.def", 25, 1);
|
||||
ReturnException ("../../gcc-read-write/gcc/m2/gm2-libs/M2EXCEPTION.def", 25, 1);
|
||||
__builtin_unreachable ();
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -64,6 +64,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
|
|||
|
||||
typedef struct M2RTS_ArgCVEnvP_p M2RTS_ArgCVEnvP;
|
||||
|
||||
# define stderrFd 2
|
||||
typedef struct M2RTS_ProcedureList_r M2RTS_ProcedureList;
|
||||
|
||||
typedef char *M2RTS_PtrToChar;
|
||||
|
|
@ -178,10 +179,19 @@ extern "C" 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 "C" 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 "C" 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 "C" void M2RTS_HaltC (void * filename, unsigned int line, void * function, void * description);
|
||||
|
||||
/*
|
||||
ExitOnHalt - if HALT is executed then call exit with the exit code, e.
|
||||
|
|
@ -193,7 +203,7 @@ extern "C" void M2RTS_ExitOnHalt (int e);
|
|||
ErrorMessage - emits an error message to stderr and then calls exit (1).
|
||||
*/
|
||||
|
||||
extern "C" 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 "C" 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
|
||||
|
|
@ -248,6 +258,18 @@ static unsigned int AppendProc (M2RTS_ProcedureList *proclist, PROC proc);
|
|||
|
||||
static void ErrorString (const char *a_, unsigned int _a_high);
|
||||
|
||||
/*
|
||||
ErrorStringC - writes a string to stderr.
|
||||
*/
|
||||
|
||||
static void ErrorStringC (void * str);
|
||||
|
||||
/*
|
||||
ErrorMessageC - emits an error message to stderr and then calls exit (1).
|
||||
*/
|
||||
|
||||
static void ErrorMessageC (void * message, void * filename, unsigned int line, void * function) __attribute__ ((noreturn));
|
||||
|
||||
/*
|
||||
InitProcList - initialize the head and tail pointers to NIL.
|
||||
*/
|
||||
|
|
@ -322,7 +344,49 @@ static void ErrorString (const char *a_, unsigned int _a_high)
|
|||
/* make a local copy of each unbounded array. */
|
||||
memcpy (a, a_, _a_high+1);
|
||||
|
||||
n = static_cast<int> (libc_write (2, &a, static_cast<size_t> (StrLib_StrLen ((const char *) a, _a_high))));
|
||||
n = static_cast<int> (libc_write (stderrFd, &a, static_cast<size_t> (StrLib_StrLen ((const char *) a, _a_high))));
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
ErrorStringC - writes a string to stderr.
|
||||
*/
|
||||
|
||||
static void ErrorStringC (void * str)
|
||||
{
|
||||
int len;
|
||||
|
||||
len = static_cast<int> (libc_write (stderrFd, str, libc_strlen (str)));
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
ErrorMessageC - emits an error message to stderr and then calls exit (1).
|
||||
*/
|
||||
|
||||
static void ErrorMessageC (void * message, void * filename, unsigned int line, void * function)
|
||||
{
|
||||
typedef struct ErrorMessageC__T2_a ErrorMessageC__T2;
|
||||
|
||||
struct ErrorMessageC__T2_a { char array[10+1]; };
|
||||
ErrorMessageC__T2 buffer;
|
||||
|
||||
ErrorStringC (filename);
|
||||
ErrorString ((const char *) ":", 1);
|
||||
NumberIO_CardToStr (line, 0, (char *) &buffer.array[0], 10);
|
||||
ErrorString ((const char *) &buffer.array[0], 10);
|
||||
ErrorString ((const char *) ":", 1);
|
||||
if ((libc_strlen (function)) > 0)
|
||||
{
|
||||
ErrorString ((const char *) "in ", 3);
|
||||
ErrorStringC (function);
|
||||
ErrorString ((const char *) " has caused ", 12);
|
||||
}
|
||||
ErrorStringC (message);
|
||||
buffer.array[0] = ASCII_nl;
|
||||
buffer.array[1] = ASCII_nul;
|
||||
ErrorString ((const char *) &buffer.array[0], 10);
|
||||
libc_exit (1);
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -519,23 +583,34 @@ extern "C" void M2RTS_HALT (int exitcode)
|
|||
|
||||
/*
|
||||
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 "C" 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)
|
||||
extern "C" 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)
|
||||
{
|
||||
char file[_file_high+1];
|
||||
char filename[_filename_high+1];
|
||||
char function[_function_high+1];
|
||||
char description[_description_high+1];
|
||||
|
||||
/* make a local copy of each unbounded array. */
|
||||
memcpy (file, file_, _file_high+1);
|
||||
memcpy (filename, filename_, _filename_high+1);
|
||||
memcpy (function, function_, _function_high+1);
|
||||
memcpy (description, description_, _description_high+1);
|
||||
|
||||
M2RTS_ErrorMessage ((const char *) description, _description_high, (const char *) file, _file_high, line, (const char *) function, _function_high);
|
||||
M2RTS_HALT (-1);
|
||||
__builtin_unreachable ();
|
||||
M2RTS_ErrorMessage ((const char *) description, _description_high, (const char *) filename, _filename_high, line, (const char *) function, _function_high);
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
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 "C" void M2RTS_HaltC (void * filename, unsigned int line, void * function, void * description)
|
||||
{
|
||||
ErrorMessageC (description, filename, line, function);
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -554,25 +629,25 @@ extern "C" void M2RTS_ExitOnHalt (int e)
|
|||
ErrorMessage - emits an error message to stderr and then calls exit (1).
|
||||
*/
|
||||
|
||||
extern "C" 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)
|
||||
extern "C" 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)
|
||||
{
|
||||
typedef struct ErrorMessage__T2_a ErrorMessage__T2;
|
||||
typedef struct ErrorMessage__T3_a ErrorMessage__T3;
|
||||
|
||||
struct ErrorMessage__T2_a { char array[10+1]; };
|
||||
ErrorMessage__T2 LineNo;
|
||||
struct ErrorMessage__T3_a { char array[10+1]; };
|
||||
ErrorMessage__T3 buffer;
|
||||
char message[_message_high+1];
|
||||
char file[_file_high+1];
|
||||
char filename[_filename_high+1];
|
||||
char function[_function_high+1];
|
||||
|
||||
/* make a local copy of each unbounded array. */
|
||||
memcpy (message, message_, _message_high+1);
|
||||
memcpy (file, file_, _file_high+1);
|
||||
memcpy (filename, filename_, _filename_high+1);
|
||||
memcpy (function, function_, _function_high+1);
|
||||
|
||||
ErrorString ((const char *) file, _file_high);
|
||||
ErrorString ((const char *) filename, _filename_high);
|
||||
ErrorString ((const char *) ":", 1);
|
||||
NumberIO_CardToStr (line, 0, (char *) &LineNo.array[0], 10);
|
||||
ErrorString ((const char *) &LineNo.array[0], 10);
|
||||
NumberIO_CardToStr (line, 0, (char *) &buffer.array[0], 10);
|
||||
ErrorString ((const char *) &buffer.array[0], 10);
|
||||
ErrorString ((const char *) ":", 1);
|
||||
if (! (StrLib_StrEqual ((const char *) function, _function_high, (const char *) "", 0)))
|
||||
{
|
||||
|
|
@ -581,9 +656,9 @@ extern "C" void M2RTS_ErrorMessage (const char *message_, unsigned int _message_
|
|||
ErrorString ((const char *) " has caused ", 12);
|
||||
}
|
||||
ErrorString ((const char *) message, _message_high);
|
||||
LineNo.array[0] = ASCII_nl;
|
||||
LineNo.array[1] = ASCII_nul;
|
||||
ErrorString ((const char *) &LineNo.array[0], 10);
|
||||
buffer.array[0] = ASCII_nl;
|
||||
buffer.array[1] = ASCII_nul;
|
||||
ErrorString ((const char *) &buffer.array[0], 10);
|
||||
libc_exit (1);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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-git-devel-modula2/gcc/m2/gm2-compiler/NameKey.def", 20, 1);
|
||||
ReturnException ("../../gcc-read-write/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-git-devel-modula2/gcc/m2/gm2-compiler/NameKey.def", 20, 1);
|
||||
ReturnException ("../../gcc-read-write/gcc/m2/gm2-compiler/NameKey.def", 20, 1);
|
||||
__builtin_unreachable ();
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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-git-devel-modula2/gcc/m2/gm2-libs/PushBackInput.mod", 61);
|
||||
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);
|
||||
}
|
||||
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-git-devel-modula2/gcc/m2/gm2-libs/PushBackInput.mod", 61);
|
||||
Debug_Halt ((const char *) "assert failed", 13, 132, (const char *) "../../gcc-read-write/gcc/m2/gm2-libs/PushBackInput.mod", 54);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -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-git-devel-modula2/gcc/m2/gm2-libs/PushBackInput.mod", 61);
|
||||
Debug_Halt ((const char *) "assert failed", 13, 113, (const char *) "../../gcc-read-write/gcc/m2/gm2-libs/PushBackInput.mod", 54);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -722,7 +722,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-git-devel-modula2/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-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")));
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -732,7 +732,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-git-devel-modula2/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-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")));
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -742,7 +742,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-git-devel-modula2/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-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")));
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -752,7 +752,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-git-devel-modula2/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-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")));
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -762,7 +762,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-git-devel-modula2/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-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 ? */
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -772,7 +772,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-git-devel-modula2/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-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")));
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -782,7 +782,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-git-devel-modula2/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-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")));
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -792,7 +792,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-git-devel-modula2/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-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")));
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -802,7 +802,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-git-devel-modula2/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-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")));
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -812,7 +812,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-git-devel-modula2/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-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")));
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -822,7 +822,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-git-devel-modula2/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-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")));
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -832,7 +832,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-git-devel-modula2/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-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")));
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -842,7 +842,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-git-devel-modula2/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-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")));
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -852,7 +852,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-git-devel-modula2/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-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")));
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -862,7 +862,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-git-devel-modula2/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-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")));
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -1181,13 +1181,13 @@ extern "C" RTExceptions_EHBlock RTExceptions_GetBaseExceptionBlock (void)
|
|||
{
|
||||
if (currentEHB == NULL)
|
||||
{
|
||||
M2RTS_Halt ((const char *) "../../gcc-git-devel-modula2/gcc/m2/gm2-libs/RTExceptions.mod", 60, 598, (const char *) "GetBaseExceptionBlock", 21, (const char *) "currentEHB has not been initialized yet", 39);
|
||||
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);
|
||||
}
|
||||
else
|
||||
{
|
||||
return currentEHB;
|
||||
}
|
||||
ReturnException ("../../gcc-git-devel-modula2/gcc/m2/gm2-libs/RTExceptions.def", 25, 1);
|
||||
ReturnException ("../../gcc-read-write/gcc/m2/gm2-libs/RTExceptions.def", 25, 1);
|
||||
__builtin_unreachable ();
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -191,7 +191,7 @@ extern "C" StdIO_ProcWrite StdIO_GetCurrentOutput (void)
|
|||
M2RTS_HALT (-1);
|
||||
__builtin_unreachable ();
|
||||
}
|
||||
ReturnException ("../../gcc-git-devel-modula2/gcc/m2/gm2-libs/StdIO.def", 25, 1);
|
||||
ReturnException ("../../gcc-read-write/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-git-devel-modula2/gcc/m2/gm2-libs/StdIO.def", 25, 1);
|
||||
ReturnException ("../../gcc-read-write/gcc/m2/gm2-libs/StdIO.def", 25, 1);
|
||||
__builtin_unreachable ();
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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-git-devel-modula2/gcc/m2/gm2-compiler/SymbolKey.mod", 61);
|
||||
Debug_Halt ((const char *) "parameter t should never be NIL", 31, 240, (const char *) "../../gcc-read-write/gcc/m2/gm2-compiler/SymbolKey.mod", 54);
|
||||
}
|
||||
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-git-devel-modula2/gcc/m2/gm2-compiler/SymbolKey.mod", 61);
|
||||
Debug_Halt ((const char *) "symbol already stored", 21, 156, (const char *) "../../gcc-read-write/gcc/m2/gm2-compiler/SymbolKey.mod", 54);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -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-git-devel-modula2/gcc/m2/gm2-compiler/SymbolKey.mod", 61);
|
||||
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);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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-git-devel-modula2/gcc/m2/gm2-libs/SysStorage.mod", 58);
|
||||
Debug_Halt ((const char *) "out of memory error", 19, 50, (const char *) "../../gcc-read-write/gcc/m2/gm2-libs/SysStorage.mod", 51);
|
||||
}
|
||||
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-git-devel-modula2/gcc/m2/gm2-libs/SysStorage.mod", 58);
|
||||
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);
|
||||
}
|
||||
}
|
||||
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-git-devel-modula2/gcc/m2/gm2-libs/SysStorage.mod", 58);
|
||||
Debug_Halt ((const char *) "out of memory error", 19, 119, (const char *) "../../gcc-read-write/gcc/m2/gm2-libs/SysStorage.mod", 51);
|
||||
}
|
||||
if (enableTrace && trace)
|
||||
{
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue