Reenable library files, fix LONGREAL constants and type casts.

This commit is contained in:
David Brown 2016-09-26 19:01:59 +01:00
parent ef0a447a68
commit 9ffafc59b4
229 changed files with 11147 additions and 11288 deletions

View file

@ -1,4 +1,4 @@
/* voc 1.95 [2016/09/24]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
/* voc 1.95 [2016/09/26]. Bootstrapping compiler for address size 8, alignment 8. xtspaSfF */
#define INTEGER int16
#define LONGINT int32
@ -12,10 +12,11 @@
#include "Strings.h"
static CHAR extTools_compilationOptions[1023], extTools_CFLAGS[1023];
static CHAR extTools_CFLAGS[1023];
export void extTools_Assemble (CHAR *moduleName, LONGINT moduleName__len);
static void extTools_InitialiseCompilerCommand (CHAR *s, LONGINT s__len);
export void extTools_LinkMain (CHAR *moduleName, LONGINT moduleName__len, BOOLEAN statically, CHAR *additionalopts, LONGINT additionalopts__len);
static void extTools_execute (CHAR *title, LONGINT title__len, CHAR *cmd, LONGINT cmd__len);
@ -25,7 +26,7 @@ static void extTools_execute (CHAR *title, LONGINT title__len, CHAR *cmd, LONGIN
int16 r, status, exitcode;
__DUP(title, title__len, CHAR);
__DUP(cmd, cmd__len, CHAR);
if (__IN(18, OPM_opt, 32)) {
if (__IN(18, OPM_Options, 32)) {
Console_String(title, title__len);
Console_String(cmd, cmd__len);
Console_Ln();
@ -60,12 +61,22 @@ static void extTools_execute (CHAR *title, LONGINT title__len, CHAR *cmd, LONGIN
__DEL(cmd);
}
static void extTools_InitialiseCompilerCommand (CHAR *s, LONGINT s__len)
{
__COPY("gcc -g -O1", s, s__len);
Strings_Append((CHAR*)" -I \"", 6, (void*)s, s__len);
Strings_Append(OPM_ResourceDir, 1024, (void*)s, s__len);
Strings_Append((CHAR*)"/include\" ", 11, (void*)s, s__len);
Platform_GetEnv((CHAR*)"CFLAGS", 7, (void*)extTools_CFLAGS, 1023);
Strings_Append(extTools_CFLAGS, 1023, (void*)s, s__len);
Strings_Append((CHAR*)" ", 2, (void*)s, s__len);
}
void extTools_Assemble (CHAR *moduleName, LONGINT moduleName__len)
{
CHAR cmd[1023];
__DUP(moduleName, moduleName__len, CHAR);
__MOVE("gcc -g -O1", cmd, 11);
Strings_Append(extTools_compilationOptions, 1023, (void*)cmd, 1023);
extTools_InitialiseCompilerCommand((void*)cmd, 1023);
Strings_Append((CHAR*)"-c ", 4, (void*)cmd, 1023);
Strings_Append(moduleName, moduleName__len, (void*)cmd, 1023);
Strings_Append((CHAR*)".c", 3, (void*)cmd, 1023);
@ -77,9 +88,7 @@ void extTools_LinkMain (CHAR *moduleName, LONGINT moduleName__len, BOOLEAN stati
{
CHAR cmd[1023];
__DUP(additionalopts, additionalopts__len, CHAR);
__MOVE("gcc -g -O1", cmd, 11);
Strings_Append((CHAR*)" ", 2, (void*)cmd, 1023);
Strings_Append(extTools_compilationOptions, 1023, (void*)cmd, 1023);
extTools_InitialiseCompilerCommand((void*)cmd, 1023);
Strings_Append(moduleName, moduleName__len, (void*)cmd, 1023);
Strings_Append((CHAR*)".c ", 4, (void*)cmd, 1023);
Strings_Append(additionalopts, additionalopts__len, (void*)cmd, 1023);
@ -92,6 +101,7 @@ void extTools_LinkMain (CHAR *moduleName, LONGINT moduleName__len, BOOLEAN stati
Strings_Append((CHAR*)"", 1, (void*)cmd, 1023);
Strings_Append((CHAR*)"/lib\"", 6, (void*)cmd, 1023);
Strings_Append((CHAR*)" -l voc", 8, (void*)cmd, 1023);
Strings_Append(OPM_Model, 10, (void*)cmd, 1023);
extTools_execute((CHAR*)"Assemble and link: ", 20, cmd, 1023);
__DEL(additionalopts);
}
@ -107,11 +117,5 @@ export void *extTools__init(void)
__MODULE_IMPORT(Strings);
__REGMOD("extTools", 0);
/* BEGIN */
Strings_Append((CHAR*)" -I \"", 6, (void*)extTools_compilationOptions, 1023);
Strings_Append((CHAR*)"", 1, (void*)extTools_compilationOptions, 1023);
Strings_Append((CHAR*)"/include\" ", 11, (void*)extTools_compilationOptions, 1023);
Platform_GetEnv((CHAR*)"CFLAGS", 7, (void*)extTools_CFLAGS, 1023);
Strings_Append(extTools_CFLAGS, 1023, (void*)extTools_compilationOptions, 1023);
Strings_Append((CHAR*)" ", 2, (void*)extTools_compilationOptions, 1023);
__ENDMOD;
}