Update bootstrap sources.

This commit is contained in:
David Brown 2016-07-11 11:01:11 +01:00
parent 57cd40aa9d
commit f784a41f8f
201 changed files with 302 additions and 282 deletions

View file

@ -29,13 +29,13 @@ default libraries complying with the Oakwood Guidelines for Oberon-2 compilers.
###### Prerequisites
| Platform | Packages |
| --------- | ------------ |
| Debian/Ubuntu/Mint ... | apt-get install git |
| Fedora/RHEL/CentOS ... | yum install git gcc glibc-static |
| FreeBSD/OpenBSD/NetBSD | pkg install git |
| Cygwin | use setup-x86[_x64] to add packages git, make and gcc-core |
| Darwin | run 'git' at the command line and accept the prompt to install it. |
| Platform | Packages |
| --------- | ------------ |
| Debian/Ubuntu/Mint ... | `apt-get install git` |
| Fedora/RHEL/CentOS ... | `yum install git gcc glibc-static` |
| FreeBSD/OpenBSD/NetBSD | `pkg install git` |
| Cygwin | use setup-x86[_x64] to add packages git, make and gcc-core |
| Darwin | type 'git' at the command line and accept the prompt to install it. |
More details, including for MingW and MS C, in [Installation](/doc/Installation.md).
@ -52,11 +52,11 @@ Since 'make full' will install the compiler and libraries, it needs root (unix)
Set your path to the installed compiler binary location as reported
by make full, e.g.
| System | Set path |
| --------- | -------------------------------------- |
| Linux | `export PATH="/opt/voc/bin:$PATH"` |
| BSD | `export PATH="/usr/local/share/voc/bin:$PATH"` |
| Windows | See [Installation](/doc/Installation.md) |
| System | Set path |
| --------- | -------------------------------------- |
| Linux | `export PATH="/opt/voc/bin:$PATH"` |
| BSD | `export PATH="/usr/local/share/voc/bin:$PATH"` |
| Windows | See [Installation](/doc/Installation.md) |
| Termux | `export PATH="/data/data/com.termux/files/opt/voc/bin:$PATH"` |
Also see [Installation](/doc/Installation.md).

View file

@ -1,7 +1,8 @@
/* voc 1.95 [2016/06/30] for gcc LP64 on cygwin xtspkaSfF */
/* voc 1.95 [2016/07/11] for gcc LP64 on cygwin xtspkaSfF */
#include "SYSTEM.h"
export CHAR Configuration_versionLong[41];
@ -12,5 +13,6 @@ export void *Configuration__init(void)
__DEFMOD;
__REGMOD("Configuration", 0);
/* BEGIN */
__MOVE("1.95 [2016/07/11] for gcc LP64 on cygwin", Configuration_versionLong, 41);
__ENDMOD;
}

View file

@ -1,4 +1,4 @@
/* voc 1.95 [2016/06/30] for gcc LP64 on cygwin xtspkaSfF */
/* voc 1.95 [2016/07/11] for gcc LP64 on cygwin xtspkaSfF */
#ifndef Configuration__h
#define Configuration__h
@ -6,6 +6,7 @@
#include "SYSTEM.h"
import CHAR Configuration_versionLong[41];
import void *Configuration__init(void);

View file

@ -1,4 +1,4 @@
/* voc 1.95 [2016/06/30] for gcc LP64 on cygwin xtspkaSfF */
/* voc 1.95 [2016/07/11] for gcc LP64 on cygwin xtspkaSfF */
#include "SYSTEM.h"
#include "Platform.h"

View file

@ -1,4 +1,4 @@
/* voc 1.95 [2016/06/30] for gcc LP64 on cygwin xtspkaSfF */
/* voc 1.95 [2016/07/11] for gcc LP64 on cygwin xtspkaSfF */
#ifndef Console__h
#define Console__h

View file

@ -1,4 +1,4 @@
/* voc 1.95 [2016/06/30] for gcc LP64 on cygwin tspkaSfF */
/* voc 1.95 [2016/07/11] for gcc LP64 on cygwin tspkaSfF */
#include "SYSTEM.h"
#include "Configuration.h"
#include "Console.h"

View file

@ -1,4 +1,4 @@
/* voc 1.95 [2016/06/30] for gcc LP64 on cygwin tspkaSfF */
/* voc 1.95 [2016/07/11] for gcc LP64 on cygwin tspkaSfF */
#ifndef Files__h
#define Files__h

View file

@ -1,4 +1,4 @@
/* voc 1.95 [2016/06/30] for gcc LP64 on cygwin tskSfF */
/* voc 1.95 [2016/07/11] for gcc LP64 on cygwin tskSfF */
#include "SYSTEM.h"
struct Heap__1 {

View file

@ -1,4 +1,4 @@
/* voc 1.95 [2016/06/30] for gcc LP64 on cygwin tskSfF */
/* voc 1.95 [2016/07/11] for gcc LP64 on cygwin tskSfF */
#ifndef Heap__h
#define Heap__h

View file

@ -1,4 +1,4 @@
/* voc 1.95 [2016/06/30] for gcc LP64 on cygwin xtspkaSfF */
/* voc 1.95 [2016/07/11] for gcc LP64 on cygwin xtspkaSfF */
#include "SYSTEM.h"
#include "Console.h"
#include "Heap.h"

View file

@ -1,4 +1,4 @@
/* voc 1.95 [2016/06/30] for gcc LP64 on cygwin xtspkaSfF */
/* voc 1.95 [2016/07/11] for gcc LP64 on cygwin xtspkaSfF */
#ifndef Modules__h
#define Modules__h

View file

@ -1,4 +1,4 @@
/* voc 1.95 [2016/06/30] for gcc LP64 on cygwin xtspkaSfF */
/* voc 1.95 [2016/07/11] for gcc LP64 on cygwin xtspkaSfF */
#include "SYSTEM.h"
#include "OPM.h"
#include "OPS.h"

View file

@ -1,4 +1,4 @@
/* voc 1.95 [2016/06/30] for gcc LP64 on cygwin xtspkaSfF */
/* voc 1.95 [2016/07/11] for gcc LP64 on cygwin xtspkaSfF */
#ifndef OPB__h
#define OPB__h

View file

@ -1,4 +1,4 @@
/* voc 1.95 [2016/06/30] for gcc LP64 on cygwin xtspkaSfF */
/* voc 1.95 [2016/07/11] for gcc LP64 on cygwin xtspkaSfF */
#include "SYSTEM.h"
#include "Configuration.h"
#include "OPM.h"
@ -1241,7 +1241,7 @@ static void OPC_GenHeaderMsg (void)
OPM_WriteString((CHAR*)"/*", (LONGINT)3);
OPM_WriteString((CHAR*)" voc ", (LONGINT)6);
OPM_Write(' ');
OPM_WriteString((CHAR*)"1.95 [2016/06/30] for gcc LP64 on cygwin", (LONGINT)41);
OPM_WriteString(Configuration_versionLong, ((LONGINT)(41)));
OPM_Write(' ');
i = 0;
while (i <= 31) {

View file

@ -1,4 +1,4 @@
/* voc 1.95 [2016/06/30] for gcc LP64 on cygwin xtspkaSfF */
/* voc 1.95 [2016/07/11] for gcc LP64 on cygwin xtspkaSfF */
#ifndef OPC__h
#define OPC__h

View file

@ -1,4 +1,4 @@
/* voc 1.95 [2016/06/30] for gcc LP64 on cygwin xtspkaSfF */
/* voc 1.95 [2016/07/11] for gcc LP64 on cygwin xtspkaSfF */
#include "SYSTEM.h"
#include "Configuration.h"
#include "Console.h"
@ -198,7 +198,7 @@ BOOLEAN OPM_OpenPar (void)
if (Platform_ArgCount == 1) {
OPM_LogWLn();
OPM_LogWStr((CHAR*)"Vishap Oberon-2 compiler v", (LONGINT)27);
OPM_LogWStr((CHAR*)"1.95 [2016/06/30] for gcc LP64 on cygwin", (LONGINT)41);
OPM_LogWStr(Configuration_versionLong, ((LONGINT)(41)));
OPM_LogW('.');
OPM_LogWLn();
OPM_LogWStr((CHAR*)"Based on Ofront by Software Templ OEG, continued by Norayr Chilingarian and others.", (LONGINT)84);

View file

@ -1,4 +1,4 @@
/* voc 1.95 [2016/06/30] for gcc LP64 on cygwin xtspkaSfF */
/* voc 1.95 [2016/07/11] for gcc LP64 on cygwin xtspkaSfF */
#ifndef OPM__h
#define OPM__h

View file

@ -1,4 +1,4 @@
/* voc 1.95 [2016/06/30] for gcc LP64 on cygwin xtspkaSfF */
/* voc 1.95 [2016/07/11] for gcc LP64 on cygwin xtspkaSfF */
#include "SYSTEM.h"
#include "OPB.h"
#include "OPM.h"

View file

@ -1,4 +1,4 @@
/* voc 1.95 [2016/06/30] for gcc LP64 on cygwin xtspkaSfF */
/* voc 1.95 [2016/07/11] for gcc LP64 on cygwin xtspkaSfF */
#ifndef OPP__h
#define OPP__h

View file

@ -1,4 +1,4 @@
/* voc 1.95 [2016/06/30] for gcc LP64 on cygwin tspkaSfF */
/* voc 1.95 [2016/07/11] for gcc LP64 on cygwin tspkaSfF */
#include "SYSTEM.h"
#include "OPM.h"
@ -127,7 +127,7 @@ static INTEGER Ord__7 (CHAR ch, BOOLEAN hex)
static void OPS_Number (void)
{
INTEGER i, m, n, d, e;
INTEGER i, m, n, d, e, maxHdig;
CHAR dig[24];
LONGREAL f;
CHAR expCh;
@ -182,8 +182,9 @@ static void OPS_Number (void)
} else if (OPS_ch == 'H') {
OPM_Get(&OPS_ch);
OPS_numtyp = 2;
if (n <= 8) {
if ((n == 8 && dig[0] > '7')) {
maxHdig = 8;
if (n <= maxHdig) {
if ((n == maxHdig && dig[0] > '7')) {
OPS_intval = -1;
}
while (i < n) {

View file

@ -1,4 +1,4 @@
/* voc 1.95 [2016/06/30] for gcc LP64 on cygwin tspkaSfF */
/* voc 1.95 [2016/07/11] for gcc LP64 on cygwin tspkaSfF */
#ifndef OPS__h
#define OPS__h

View file

@ -1,4 +1,4 @@
/* voc 1.95 [2016/06/30] for gcc LP64 on cygwin xtspkaSfF */
/* voc 1.95 [2016/07/11] for gcc LP64 on cygwin xtspkaSfF */
#include "SYSTEM.h"
#include "OPM.h"
#include "OPS.h"

View file

@ -1,4 +1,4 @@
/* voc 1.95 [2016/06/30] for gcc LP64 on cygwin xtspkaSfF */
/* voc 1.95 [2016/07/11] for gcc LP64 on cygwin xtspkaSfF */
#ifndef OPT__h
#define OPT__h

View file

@ -1,4 +1,4 @@
/* voc 1.95 [2016/06/30] for gcc LP64 on cygwin xtspkaSfF */
/* voc 1.95 [2016/07/11] for gcc LP64 on cygwin xtspkaSfF */
#include "SYSTEM.h"
#include "OPC.h"
#include "OPM.h"

View file

@ -1,4 +1,4 @@
/* voc 1.95 [2016/06/30] for gcc LP64 on cygwin xtspkaSfF */
/* voc 1.95 [2016/07/11] for gcc LP64 on cygwin xtspkaSfF */
#ifndef OPV__h
#define OPV__h

View file

@ -1,4 +1,4 @@
/* voc 1.95 [2016/06/30] for gcc LP64 on cygwin xtspkaSfF */
/* voc 1.95 [2016/07/11] for gcc LP64 on cygwin xtspkaSfF */
#include "SYSTEM.h"
typedef

View file

@ -1,4 +1,4 @@
/* voc 1.95 [2016/06/30] for gcc LP64 on cygwin xtspkaSfF */
/* voc 1.95 [2016/07/11] for gcc LP64 on cygwin xtspkaSfF */
#ifndef Platform__h
#define Platform__h

View file

@ -1,4 +1,4 @@
/* voc 1.95 [2016/06/30] for gcc LP64 on cygwin xtspkaSfF */
/* voc 1.95 [2016/07/11] for gcc LP64 on cygwin xtspkaSfF */
#include "SYSTEM.h"

View file

@ -1,4 +1,4 @@
/* voc 1.95 [2016/06/30] for gcc LP64 on cygwin xtspkaSfF */
/* voc 1.95 [2016/07/11] for gcc LP64 on cygwin xtspkaSfF */
#ifndef Reals__h
#define Reals__h

View file

@ -49,7 +49,7 @@
#define LONGREAL double
#define SYSTEM_PTR void*
// For 32 bit builds, the size of LONGINT depends on a make option:
// For 32 bit builds, the size of LONGINT depends on a make option:
#if (__SIZEOF_POINTER__ == 8) || defined(LARGE) || defined(_WIN64)
#define INTEGER int // INTEGER is 32 bit.
@ -126,21 +126,21 @@ static int __str_cmp(CHAR *x, CHAR *y){
#define __GET(a, x, t) x= *(t*)(uintptr_t)(a)
#define __PUT(a, x, t) *(t*)(uintptr_t)(a)=x
#define __LSHL(x, n, t) ((t)((unsigned t)(x)<<(n)))
#define __LSHR(x, n, t) ((t)((unsigned t)(x)>>(n)))
#define __LSH(x, n, t) ((n)>=0? __LSHL(x, n, t): __LSHR(x, -(n), t))
#define __ROTL(x, n, t) ((t)((unsigned t)(x)<<(n)|(unsigned t)(x)>>(8*sizeof(t)-(n))))
#define __ROTR(x, n, t) ((t)((unsigned t)(x)>>(n)|(unsigned t)(x)<<(8*sizeof(t)-(n))))
#define __LSHR(x, n, t) ((t)((unsigned t)(x)>>(n)))
#define __LSH(x, n, t) ((n)>=0? __LSHL(x, n, t): __LSHR(x, -(n), t))
#define __ROTL(x, n, t) ((t)((unsigned t)(x)<<(n)|(unsigned t)(x)>>(8*sizeof(t)-(n))))
#define __ROTR(x, n, t) ((t)((unsigned t)(x)>>(n)|(unsigned t)(x)<<(8*sizeof(t)-(n))))
#define __ROT(x, n, t) ((n)>=0? __ROTL(x, n, t): __ROTR(x, -(n), t))
#define __BIT(x, n) (*(unsigned LONGINT*)(x)>>(n)&1)
#define __MOVE(s, d, n) memcpy((char*)(uintptr_t)(d),(char*)(uintptr_t)(s),n)
#define __ASHL(x, n) ((LONGINT)(x)<<(n))
#define __ASHR(x, n) ((LONGINT)(x)>>(n))
#define __ASH(x, n) ((n)>=0?__ASHL(x,n):__ASHR(x,-(n)))
#define __ROTL(x, n, t) ((t)((unsigned t)(x)<<(n)|(unsigned t)(x)>>(8*sizeof(t)-(n))))
#define __ROTR(x, n, t) ((t)((unsigned t)(x)>>(n)|(unsigned t)(x)<<(8*sizeof(t)-(n))))
#define __ROT(x, n, t) ((n)>=0? __ROTL(x, n, t): __ROTR(x, -(n), t))
#define __BIT(x, n) (*(unsigned LONGINT*)(x)>>(n)&1)
#define __MOVE(s, d, n) memcpy((char*)(uintptr_t)(d),(char*)(uintptr_t)(s),n)
#define __ASHF(x, n) SYSTEM_ASH((LONGINT)(x), (LONGINT)(n))
#define __SHORT(x, y) ((int)((unsigned LONGINT)(x)+(y)<(y)+(y)?(x):(__HALT(-8),0)))
#define __SHORTF(x, y) ((int)(__RF((x)+(y),(y)+(y))-(y)))

View file

@ -1,4 +1,4 @@
/* voc 1.95 [2016/06/30] for gcc LP64 on cygwin xtspkaSfF */
/* voc 1.95 [2016/07/11] for gcc LP64 on cygwin xtspkaSfF */
#include "SYSTEM.h"

View file

@ -1,4 +1,4 @@
/* voc 1.95 [2016/06/30] for gcc LP64 on cygwin xtspkaSfF */
/* voc 1.95 [2016/07/11] for gcc LP64 on cygwin xtspkaSfF */
#ifndef Strings__h
#define Strings__h

View file

@ -1,4 +1,4 @@
/* voc 1.95 [2016/06/30] for gcc LP64 on cygwin xtspkaSfF */
/* voc 1.95 [2016/07/11] for gcc LP64 on cygwin xtspkaSfF */
#include "SYSTEM.h"
#include "Files.h"
#include "Modules.h"

View file

@ -1,4 +1,4 @@
/* voc 1.95 [2016/06/30] for gcc LP64 on cygwin xtspkaSfF */
/* voc 1.95 [2016/07/11] for gcc LP64 on cygwin xtspkaSfF */
#ifndef Texts__h
#define Texts__h

View file

@ -1,4 +1,4 @@
/* voc 1.95 [2016/06/30] for gcc LP64 on cygwin xtspkamSf */
/* voc 1.95 [2016/07/11] for gcc LP64 on cygwin xtspkamSf */
#include "SYSTEM.h"
#include "Configuration.h"
#include "Heap.h"

View file

@ -1,4 +1,4 @@
/* voc 1.95 [2016/06/30] for gcc LP64 on cygwin xtspkaSfF */
/* voc 1.95 [2016/07/11] for gcc LP64 on cygwin xtspkaSfF */
#include "SYSTEM.h"
typedef

View file

@ -1,4 +1,4 @@
/* voc 1.95 [2016/06/30] for gcc LP64 on cygwin xtspkaSfF */
/* voc 1.95 [2016/07/11] for gcc LP64 on cygwin xtspkaSfF */
#ifndef errors__h
#define errors__h

View file

@ -1,4 +1,4 @@
/* voc 1.95 [2016/06/30] for gcc LP64 on cygwin xtspkaSfF */
/* voc 1.95 [2016/07/11] for gcc LP64 on cygwin xtspkaSfF */
#include "SYSTEM.h"
#include "Configuration.h"
#include "Console.h"

View file

@ -1,4 +1,4 @@
/* voc 1.95 [2016/06/30] for gcc LP64 on cygwin xtspkaSfF */
/* voc 1.95 [2016/07/11] for gcc LP64 on cygwin xtspkaSfF */
#ifndef extTools__h
#define extTools__h

View file

@ -1,4 +1,4 @@
/* voc 1.95 [2016/06/30] for gcc LP64 on cygwin xtspkaSfF */
/* voc 1.95 [2016/07/11] for gcc LP64 on cygwin xtspkaSfF */
#include "SYSTEM.h"
#include "Console.h"
#include "Strings.h"

View file

@ -1,4 +1,4 @@
/* voc 1.95 [2016/06/30] for gcc LP64 on cygwin xtspkaSfF */
/* voc 1.95 [2016/07/11] for gcc LP64 on cygwin xtspkaSfF */
#ifndef vt100__h
#define vt100__h

View file

@ -1,7 +1,8 @@
/* voc 1.95 [2016/06/30] for gcc LP64 on cygwin xtspkaSfF */
/* voc 1.95 [2016/07/11] for gcc LP64 on cygwin xtspkaSfF */
#include "SYSTEM.h"
export CHAR Configuration_versionLong[41];
@ -12,5 +13,6 @@ export void *Configuration__init(void)
__DEFMOD;
__REGMOD("Configuration", 0);
/* BEGIN */
__MOVE("1.95 [2016/07/11] for gcc LP64 on cygwin", Configuration_versionLong, 41);
__ENDMOD;
}

View file

@ -1,4 +1,4 @@
/* voc 1.95 [2016/06/30] for gcc LP64 on cygwin xtspkaSfF */
/* voc 1.95 [2016/07/11] for gcc LP64 on cygwin xtspkaSfF */
#ifndef Configuration__h
#define Configuration__h
@ -6,6 +6,7 @@
#include "SYSTEM.h"
import CHAR Configuration_versionLong[41];
import void *Configuration__init(void);

View file

@ -1,4 +1,4 @@
/* voc 1.95 [2016/06/30] for gcc LP64 on cygwin xtspkaSfF */
/* voc 1.95 [2016/07/11] for gcc LP64 on cygwin xtspkaSfF */
#include "SYSTEM.h"
#include "Platform.h"

View file

@ -1,4 +1,4 @@
/* voc 1.95 [2016/06/30] for gcc LP64 on cygwin xtspkaSfF */
/* voc 1.95 [2016/07/11] for gcc LP64 on cygwin xtspkaSfF */
#ifndef Console__h
#define Console__h

View file

@ -1,4 +1,4 @@
/* voc 1.95 [2016/06/30] for gcc LP64 on cygwin tspkaSfF */
/* voc 1.95 [2016/07/11] for gcc LP64 on cygwin tspkaSfF */
#include "SYSTEM.h"
#include "Configuration.h"
#include "Console.h"

View file

@ -1,4 +1,4 @@
/* voc 1.95 [2016/06/30] for gcc LP64 on cygwin tspkaSfF */
/* voc 1.95 [2016/07/11] for gcc LP64 on cygwin tspkaSfF */
#ifndef Files__h
#define Files__h

View file

@ -1,4 +1,4 @@
/* voc 1.95 [2016/06/30] for gcc LP64 on cygwin tskSfF */
/* voc 1.95 [2016/07/11] for gcc LP64 on cygwin tskSfF */
#include "SYSTEM.h"
struct Heap__1 {

View file

@ -1,4 +1,4 @@
/* voc 1.95 [2016/06/30] for gcc LP64 on cygwin tskSfF */
/* voc 1.95 [2016/07/11] for gcc LP64 on cygwin tskSfF */
#ifndef Heap__h
#define Heap__h

View file

@ -1,4 +1,4 @@
/* voc 1.95 [2016/06/30] for gcc LP64 on cygwin xtspkaSfF */
/* voc 1.95 [2016/07/11] for gcc LP64 on cygwin xtspkaSfF */
#include "SYSTEM.h"
#include "Console.h"
#include "Heap.h"

View file

@ -1,4 +1,4 @@
/* voc 1.95 [2016/06/30] for gcc LP64 on cygwin xtspkaSfF */
/* voc 1.95 [2016/07/11] for gcc LP64 on cygwin xtspkaSfF */
#ifndef Modules__h
#define Modules__h

View file

@ -1,4 +1,4 @@
/* voc 1.95 [2016/06/30] for gcc LP64 on cygwin xtspkaSfF */
/* voc 1.95 [2016/07/11] for gcc LP64 on cygwin xtspkaSfF */
#include "SYSTEM.h"
#include "OPM.h"
#include "OPS.h"

View file

@ -1,4 +1,4 @@
/* voc 1.95 [2016/06/30] for gcc LP64 on cygwin xtspkaSfF */
/* voc 1.95 [2016/07/11] for gcc LP64 on cygwin xtspkaSfF */
#ifndef OPB__h
#define OPB__h

View file

@ -1,4 +1,4 @@
/* voc 1.95 [2016/06/30] for gcc LP64 on cygwin xtspkaSfF */
/* voc 1.95 [2016/07/11] for gcc LP64 on cygwin xtspkaSfF */
#include "SYSTEM.h"
#include "Configuration.h"
#include "OPM.h"
@ -1241,7 +1241,7 @@ static void OPC_GenHeaderMsg (void)
OPM_WriteString((CHAR*)"/*", (LONGINT)3);
OPM_WriteString((CHAR*)" voc ", (LONGINT)6);
OPM_Write(' ');
OPM_WriteString((CHAR*)"1.95 [2016/06/30] for gcc LP64 on cygwin", (LONGINT)41);
OPM_WriteString(Configuration_versionLong, ((LONGINT)(41)));
OPM_Write(' ');
i = 0;
while (i <= 31) {

View file

@ -1,4 +1,4 @@
/* voc 1.95 [2016/06/30] for gcc LP64 on cygwin xtspkaSfF */
/* voc 1.95 [2016/07/11] for gcc LP64 on cygwin xtspkaSfF */
#ifndef OPC__h
#define OPC__h

View file

@ -1,4 +1,4 @@
/* voc 1.95 [2016/06/30] for gcc LP64 on cygwin xtspkaSfF */
/* voc 1.95 [2016/07/11] for gcc LP64 on cygwin xtspkaSfF */
#include "SYSTEM.h"
#include "Configuration.h"
#include "Console.h"
@ -198,7 +198,7 @@ BOOLEAN OPM_OpenPar (void)
if (Platform_ArgCount == 1) {
OPM_LogWLn();
OPM_LogWStr((CHAR*)"Vishap Oberon-2 compiler v", (LONGINT)27);
OPM_LogWStr((CHAR*)"1.95 [2016/06/30] for gcc LP64 on cygwin", (LONGINT)41);
OPM_LogWStr(Configuration_versionLong, ((LONGINT)(41)));
OPM_LogW('.');
OPM_LogWLn();
OPM_LogWStr((CHAR*)"Based on Ofront by Software Templ OEG, continued by Norayr Chilingarian and others.", (LONGINT)84);

View file

@ -1,4 +1,4 @@
/* voc 1.95 [2016/06/30] for gcc LP64 on cygwin xtspkaSfF */
/* voc 1.95 [2016/07/11] for gcc LP64 on cygwin xtspkaSfF */
#ifndef OPM__h
#define OPM__h

View file

@ -1,4 +1,4 @@
/* voc 1.95 [2016/06/30] for gcc LP64 on cygwin xtspkaSfF */
/* voc 1.95 [2016/07/11] for gcc LP64 on cygwin xtspkaSfF */
#include "SYSTEM.h"
#include "OPB.h"
#include "OPM.h"

View file

@ -1,4 +1,4 @@
/* voc 1.95 [2016/06/30] for gcc LP64 on cygwin xtspkaSfF */
/* voc 1.95 [2016/07/11] for gcc LP64 on cygwin xtspkaSfF */
#ifndef OPP__h
#define OPP__h

View file

@ -1,4 +1,4 @@
/* voc 1.95 [2016/06/30] for gcc LP64 on cygwin tspkaSfF */
/* voc 1.95 [2016/07/11] for gcc LP64 on cygwin tspkaSfF */
#include "SYSTEM.h"
#include "OPM.h"
@ -127,7 +127,7 @@ static INTEGER Ord__7 (CHAR ch, BOOLEAN hex)
static void OPS_Number (void)
{
INTEGER i, m, n, d, e;
INTEGER i, m, n, d, e, maxHdig;
CHAR dig[24];
LONGREAL f;
CHAR expCh;
@ -182,8 +182,9 @@ static void OPS_Number (void)
} else if (OPS_ch == 'H') {
OPM_Get(&OPS_ch);
OPS_numtyp = 2;
if (n <= 8) {
if ((n == 8 && dig[0] > '7')) {
maxHdig = 8;
if (n <= maxHdig) {
if ((n == maxHdig && dig[0] > '7')) {
OPS_intval = -1;
}
while (i < n) {

View file

@ -1,4 +1,4 @@
/* voc 1.95 [2016/06/30] for gcc LP64 on cygwin tspkaSfF */
/* voc 1.95 [2016/07/11] for gcc LP64 on cygwin tspkaSfF */
#ifndef OPS__h
#define OPS__h

View file

@ -1,4 +1,4 @@
/* voc 1.95 [2016/06/30] for gcc LP64 on cygwin xtspkaSfF */
/* voc 1.95 [2016/07/11] for gcc LP64 on cygwin xtspkaSfF */
#include "SYSTEM.h"
#include "OPM.h"
#include "OPS.h"

View file

@ -1,4 +1,4 @@
/* voc 1.95 [2016/06/30] for gcc LP64 on cygwin xtspkaSfF */
/* voc 1.95 [2016/07/11] for gcc LP64 on cygwin xtspkaSfF */
#ifndef OPT__h
#define OPT__h

View file

@ -1,4 +1,4 @@
/* voc 1.95 [2016/06/30] for gcc LP64 on cygwin xtspkaSfF */
/* voc 1.95 [2016/07/11] for gcc LP64 on cygwin xtspkaSfF */
#include "SYSTEM.h"
#include "OPC.h"
#include "OPM.h"

View file

@ -1,4 +1,4 @@
/* voc 1.95 [2016/06/30] for gcc LP64 on cygwin xtspkaSfF */
/* voc 1.95 [2016/07/11] for gcc LP64 on cygwin xtspkaSfF */
#ifndef OPV__h
#define OPV__h

View file

@ -1,4 +1,4 @@
/* voc 1.95 [2016/06/30] for gcc LP64 on cygwin xtspkaSfF */
/* voc 1.95 [2016/07/11] for gcc LP64 on cygwin xtspkaSfF */
#include "SYSTEM.h"
typedef

View file

@ -1,4 +1,4 @@
/* voc 1.95 [2016/06/30] for gcc LP64 on cygwin xtspkaSfF */
/* voc 1.95 [2016/07/11] for gcc LP64 on cygwin xtspkaSfF */
#ifndef Platform__h
#define Platform__h

View file

@ -1,4 +1,4 @@
/* voc 1.95 [2016/06/30] for gcc LP64 on cygwin xtspkaSfF */
/* voc 1.95 [2016/07/11] for gcc LP64 on cygwin xtspkaSfF */
#include "SYSTEM.h"

View file

@ -1,4 +1,4 @@
/* voc 1.95 [2016/06/30] for gcc LP64 on cygwin xtspkaSfF */
/* voc 1.95 [2016/07/11] for gcc LP64 on cygwin xtspkaSfF */
#ifndef Reals__h
#define Reals__h

View file

@ -49,7 +49,7 @@
#define LONGREAL double
#define SYSTEM_PTR void*
// For 32 bit builds, the size of LONGINT depends on a make option:
// For 32 bit builds, the size of LONGINT depends on a make option:
#if (__SIZEOF_POINTER__ == 8) || defined(LARGE) || defined(_WIN64)
#define INTEGER int // INTEGER is 32 bit.
@ -126,21 +126,21 @@ static int __str_cmp(CHAR *x, CHAR *y){
#define __GET(a, x, t) x= *(t*)(uintptr_t)(a)
#define __PUT(a, x, t) *(t*)(uintptr_t)(a)=x
#define __LSHL(x, n, t) ((t)((unsigned t)(x)<<(n)))
#define __LSHR(x, n, t) ((t)((unsigned t)(x)>>(n)))
#define __LSH(x, n, t) ((n)>=0? __LSHL(x, n, t): __LSHR(x, -(n), t))
#define __ROTL(x, n, t) ((t)((unsigned t)(x)<<(n)|(unsigned t)(x)>>(8*sizeof(t)-(n))))
#define __ROTR(x, n, t) ((t)((unsigned t)(x)>>(n)|(unsigned t)(x)<<(8*sizeof(t)-(n))))
#define __LSHR(x, n, t) ((t)((unsigned t)(x)>>(n)))
#define __LSH(x, n, t) ((n)>=0? __LSHL(x, n, t): __LSHR(x, -(n), t))
#define __ROTL(x, n, t) ((t)((unsigned t)(x)<<(n)|(unsigned t)(x)>>(8*sizeof(t)-(n))))
#define __ROTR(x, n, t) ((t)((unsigned t)(x)>>(n)|(unsigned t)(x)<<(8*sizeof(t)-(n))))
#define __ROT(x, n, t) ((n)>=0? __ROTL(x, n, t): __ROTR(x, -(n), t))
#define __BIT(x, n) (*(unsigned LONGINT*)(x)>>(n)&1)
#define __MOVE(s, d, n) memcpy((char*)(uintptr_t)(d),(char*)(uintptr_t)(s),n)
#define __ASHL(x, n) ((LONGINT)(x)<<(n))
#define __ASHR(x, n) ((LONGINT)(x)>>(n))
#define __ASH(x, n) ((n)>=0?__ASHL(x,n):__ASHR(x,-(n)))
#define __ROTL(x, n, t) ((t)((unsigned t)(x)<<(n)|(unsigned t)(x)>>(8*sizeof(t)-(n))))
#define __ROTR(x, n, t) ((t)((unsigned t)(x)>>(n)|(unsigned t)(x)<<(8*sizeof(t)-(n))))
#define __ROT(x, n, t) ((n)>=0? __ROTL(x, n, t): __ROTR(x, -(n), t))
#define __BIT(x, n) (*(unsigned LONGINT*)(x)>>(n)&1)
#define __MOVE(s, d, n) memcpy((char*)(uintptr_t)(d),(char*)(uintptr_t)(s),n)
#define __ASHF(x, n) SYSTEM_ASH((LONGINT)(x), (LONGINT)(n))
#define __SHORT(x, y) ((int)((unsigned LONGINT)(x)+(y)<(y)+(y)?(x):(__HALT(-8),0)))
#define __SHORTF(x, y) ((int)(__RF((x)+(y),(y)+(y))-(y)))

View file

@ -1,4 +1,4 @@
/* voc 1.95 [2016/06/30] for gcc LP64 on cygwin xtspkaSfF */
/* voc 1.95 [2016/07/11] for gcc LP64 on cygwin xtspkaSfF */
#include "SYSTEM.h"

View file

@ -1,4 +1,4 @@
/* voc 1.95 [2016/06/30] for gcc LP64 on cygwin xtspkaSfF */
/* voc 1.95 [2016/07/11] for gcc LP64 on cygwin xtspkaSfF */
#ifndef Strings__h
#define Strings__h

View file

@ -1,4 +1,4 @@
/* voc 1.95 [2016/06/30] for gcc LP64 on cygwin xtspkaSfF */
/* voc 1.95 [2016/07/11] for gcc LP64 on cygwin xtspkaSfF */
#include "SYSTEM.h"
#include "Files.h"
#include "Modules.h"

View file

@ -1,4 +1,4 @@
/* voc 1.95 [2016/06/30] for gcc LP64 on cygwin xtspkaSfF */
/* voc 1.95 [2016/07/11] for gcc LP64 on cygwin xtspkaSfF */
#ifndef Texts__h
#define Texts__h

View file

@ -1,4 +1,4 @@
/* voc 1.95 [2016/06/30] for gcc LP64 on cygwin xtspkamSf */
/* voc 1.95 [2016/07/11] for gcc LP64 on cygwin xtspkamSf */
#include "SYSTEM.h"
#include "Configuration.h"
#include "Heap.h"

View file

@ -1,4 +1,4 @@
/* voc 1.95 [2016/06/30] for gcc LP64 on cygwin xtspkaSfF */
/* voc 1.95 [2016/07/11] for gcc LP64 on cygwin xtspkaSfF */
#include "SYSTEM.h"
typedef

View file

@ -1,4 +1,4 @@
/* voc 1.95 [2016/06/30] for gcc LP64 on cygwin xtspkaSfF */
/* voc 1.95 [2016/07/11] for gcc LP64 on cygwin xtspkaSfF */
#ifndef errors__h
#define errors__h

View file

@ -1,4 +1,4 @@
/* voc 1.95 [2016/06/30] for gcc LP64 on cygwin xtspkaSfF */
/* voc 1.95 [2016/07/11] for gcc LP64 on cygwin xtspkaSfF */
#include "SYSTEM.h"
#include "Configuration.h"
#include "Console.h"

View file

@ -1,4 +1,4 @@
/* voc 1.95 [2016/06/30] for gcc LP64 on cygwin xtspkaSfF */
/* voc 1.95 [2016/07/11] for gcc LP64 on cygwin xtspkaSfF */
#ifndef extTools__h
#define extTools__h

View file

@ -1,4 +1,4 @@
/* voc 1.95 [2016/06/30] for gcc LP64 on cygwin xtspkaSfF */
/* voc 1.95 [2016/07/11] for gcc LP64 on cygwin xtspkaSfF */
#include "SYSTEM.h"
#include "Console.h"
#include "Strings.h"

View file

@ -1,4 +1,4 @@
/* voc 1.95 [2016/06/30] for gcc LP64 on cygwin xtspkaSfF */
/* voc 1.95 [2016/07/11] for gcc LP64 on cygwin xtspkaSfF */
#ifndef vt100__h
#define vt100__h

View file

@ -1,8 +1,9 @@
/* voc 1.95 [2016/06/30] for gcc LP64 on cygwin xtspkaSfF */
/* voc 1.95 [2016/07/11] for gcc LP64 on cygwin xtspkaSfF */
#define LARGE
#include "SYSTEM.h"
export CHAR Configuration_versionLong[41];
@ -13,5 +14,6 @@ export void *Configuration__init(void)
__DEFMOD;
__REGMOD("Configuration", 0);
/* BEGIN */
__MOVE("1.95 [2016/07/11] for gcc LP64 on cygwin", Configuration_versionLong, 41);
__ENDMOD;
}

View file

@ -1,4 +1,4 @@
/* voc 1.95 [2016/06/30] for gcc LP64 on cygwin xtspkaSfF */
/* voc 1.95 [2016/07/11] for gcc LP64 on cygwin xtspkaSfF */
#ifndef Configuration__h
#define Configuration__h
@ -7,6 +7,7 @@
#include "SYSTEM.h"
import CHAR Configuration_versionLong[41];
import void *Configuration__init(void);

View file

@ -1,4 +1,4 @@
/* voc 1.95 [2016/06/30] for gcc LP64 on cygwin xtspkaSfF */
/* voc 1.95 [2016/07/11] for gcc LP64 on cygwin xtspkaSfF */
#define LARGE
#include "SYSTEM.h"
#include "Platform.h"

View file

@ -1,4 +1,4 @@
/* voc 1.95 [2016/06/30] for gcc LP64 on cygwin xtspkaSfF */
/* voc 1.95 [2016/07/11] for gcc LP64 on cygwin xtspkaSfF */
#ifndef Console__h
#define Console__h

View file

@ -1,4 +1,4 @@
/* voc 1.95 [2016/06/30] for gcc LP64 on cygwin tspkaSfF */
/* voc 1.95 [2016/07/11] for gcc LP64 on cygwin tspkaSfF */
#define LARGE
#include "SYSTEM.h"
#include "Configuration.h"

View file

@ -1,4 +1,4 @@
/* voc 1.95 [2016/06/30] for gcc LP64 on cygwin tspkaSfF */
/* voc 1.95 [2016/07/11] for gcc LP64 on cygwin tspkaSfF */
#ifndef Files__h
#define Files__h

View file

@ -1,4 +1,4 @@
/* voc 1.95 [2016/06/30] for gcc LP64 on cygwin tskSfF */
/* voc 1.95 [2016/07/11] for gcc LP64 on cygwin tskSfF */
#define LARGE
#include "SYSTEM.h"

View file

@ -1,4 +1,4 @@
/* voc 1.95 [2016/06/30] for gcc LP64 on cygwin tskSfF */
/* voc 1.95 [2016/07/11] for gcc LP64 on cygwin tskSfF */
#ifndef Heap__h
#define Heap__h

View file

@ -1,4 +1,4 @@
/* voc 1.95 [2016/06/30] for gcc LP64 on cygwin xtspkaSfF */
/* voc 1.95 [2016/07/11] for gcc LP64 on cygwin xtspkaSfF */
#define LARGE
#include "SYSTEM.h"
#include "Console.h"

View file

@ -1,4 +1,4 @@
/* voc 1.95 [2016/06/30] for gcc LP64 on cygwin xtspkaSfF */
/* voc 1.95 [2016/07/11] for gcc LP64 on cygwin xtspkaSfF */
#ifndef Modules__h
#define Modules__h

View file

@ -1,4 +1,4 @@
/* voc 1.95 [2016/06/30] for gcc LP64 on cygwin xtspkaSfF */
/* voc 1.95 [2016/07/11] for gcc LP64 on cygwin xtspkaSfF */
#define LARGE
#include "SYSTEM.h"
#include "OPM.h"

View file

@ -1,4 +1,4 @@
/* voc 1.95 [2016/06/30] for gcc LP64 on cygwin xtspkaSfF */
/* voc 1.95 [2016/07/11] for gcc LP64 on cygwin xtspkaSfF */
#ifndef OPB__h
#define OPB__h

View file

@ -1,4 +1,4 @@
/* voc 1.95 [2016/06/30] for gcc LP64 on cygwin xtspkaSfF */
/* voc 1.95 [2016/07/11] for gcc LP64 on cygwin xtspkaSfF */
#define LARGE
#include "SYSTEM.h"
#include "Configuration.h"
@ -1242,7 +1242,7 @@ static void OPC_GenHeaderMsg (void)
OPM_WriteString((CHAR*)"/*", (LONGINT)3);
OPM_WriteString((CHAR*)" voc ", (LONGINT)6);
OPM_Write(' ');
OPM_WriteString((CHAR*)"1.95 [2016/06/30] for gcc LP64 on cygwin", (LONGINT)41);
OPM_WriteString(Configuration_versionLong, ((LONGINT)(41)));
OPM_Write(' ');
i = 0;
while (i <= 63) {

View file

@ -1,4 +1,4 @@
/* voc 1.95 [2016/06/30] for gcc LP64 on cygwin xtspkaSfF */
/* voc 1.95 [2016/07/11] for gcc LP64 on cygwin xtspkaSfF */
#ifndef OPC__h
#define OPC__h

View file

@ -1,4 +1,4 @@
/* voc 1.95 [2016/06/30] for gcc LP64 on cygwin xtspkaSfF */
/* voc 1.95 [2016/07/11] for gcc LP64 on cygwin xtspkaSfF */
#define LARGE
#include "SYSTEM.h"
#include "Configuration.h"
@ -199,7 +199,7 @@ BOOLEAN OPM_OpenPar (void)
if (Platform_ArgCount == 1) {
OPM_LogWLn();
OPM_LogWStr((CHAR*)"Vishap Oberon-2 compiler v", (LONGINT)27);
OPM_LogWStr((CHAR*)"1.95 [2016/06/30] for gcc LP64 on cygwin", (LONGINT)41);
OPM_LogWStr(Configuration_versionLong, ((LONGINT)(41)));
OPM_LogW('.');
OPM_LogWLn();
OPM_LogWStr((CHAR*)"Based on Ofront by Software Templ OEG, continued by Norayr Chilingarian and others.", (LONGINT)84);

View file

@ -1,4 +1,4 @@
/* voc 1.95 [2016/06/30] for gcc LP64 on cygwin xtspkaSfF */
/* voc 1.95 [2016/07/11] for gcc LP64 on cygwin xtspkaSfF */
#ifndef OPM__h
#define OPM__h

View file

@ -1,4 +1,4 @@
/* voc 1.95 [2016/06/30] for gcc LP64 on cygwin xtspkaSfF */
/* voc 1.95 [2016/07/11] for gcc LP64 on cygwin xtspkaSfF */
#define LARGE
#include "SYSTEM.h"
#include "OPB.h"

View file

@ -1,4 +1,4 @@
/* voc 1.95 [2016/06/30] for gcc LP64 on cygwin xtspkaSfF */
/* voc 1.95 [2016/07/11] for gcc LP64 on cygwin xtspkaSfF */
#ifndef OPP__h
#define OPP__h

View file

@ -1,4 +1,4 @@
/* voc 1.95 [2016/06/30] for gcc LP64 on cygwin tspkaSfF */
/* voc 1.95 [2016/07/11] for gcc LP64 on cygwin tspkaSfF */
#define LARGE
#include "SYSTEM.h"
#include "OPM.h"
@ -128,7 +128,7 @@ static INTEGER Ord__7 (CHAR ch, BOOLEAN hex)
static void OPS_Number (void)
{
INTEGER i, m, n, d, e;
INTEGER i, m, n, d, e, maxHdig;
CHAR dig[24];
LONGREAL f;
CHAR expCh;
@ -183,8 +183,9 @@ static void OPS_Number (void)
} else if (OPS_ch == 'H') {
OPM_Get(&OPS_ch);
OPS_numtyp = 2;
if (n <= 8) {
if ((n == 8 && dig[0] > '7')) {
maxHdig = 16;
if (n <= maxHdig) {
if ((n == maxHdig && dig[0] > '7')) {
OPS_intval = -1;
}
while (i < n) {

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