diff --git a/05vishap.conf b/05vishap.conf index a943f1e6..98072b24 100644 --- a/05vishap.conf +++ b/05vishap.conf @@ -1,62 +1 @@ /opt/voc-1.0/lib -/opt/voc-1.0/lib -/opt/voc-1.0/lib -/opt/voc-1.0/lib -/opt/voc-1.0/lib -/opt/voc-1.0/lib -/opt/voc-1.0/lib -/opt/voc-1.0/lib -/opt/voc-1.0/lib -/opt/voc-1.0/lib -/opt/voc-1.0/lib -/opt/voc-1.0/lib -/opt/voc-1.0/lib -/opt/voc-1.0/lib -/opt/voc-1.0/lib -/opt/voc-1.0/lib -/opt/voc-1.0/lib -/opt/voc-1.0/lib -/opt/voc-1.0/lib -/opt/voc-1.0/lib -/opt/voc-1.0/lib -/opt/voc-1.0/lib -/opt/voc-1.0/lib -/opt/voc-1.0/lib -/opt/voc-1.0/lib -/opt/voc-1.0/lib -/opt/voc-1.0/lib -/opt/voc-1.0/lib -/opt/voc-1.0/lib -/opt/voc-1.0/lib -/opt/voc-1.0/lib -/opt/voc-1.0/lib -/opt/voc-1.0/lib -/opt/voc-1.0/lib -/opt/voc-1.0/lib -/opt/voc-1.0/lib -/opt/voc-1.0/lib -/opt/voc-1.0/lib -/opt/voc-1.0/lib -/opt/voc-1.0/lib -/opt/voc-1.0/lib -/opt/voc-1.0/lib -/opt/voc-1.0/lib -/opt/voc-1.0/lib -/opt/voc-1.0/lib -/opt/voc-1.0/lib -/opt/voc-1.0/lib -/opt/voc-1.0/lib -/opt/voc-1.0/lib -/opt/voc-1.0/lib -/opt/voc-1.0/lib -/opt/voc-1.0/lib -/opt/voc-1.0/lib -/opt/voc-1.0/lib -/opt/voc-1.0/lib -/opt/voc-1.0/lib -/opt/voc-1.0/lib -/opt/voc-1.0/lib -/opt/voc-1.0/lib -/opt/voc-1.0/lib -/opt/voc-1.0/lib -/opt/voc-1.0/lib diff --git a/makefile b/makefile index 6ee0a4ea..d0fc2a2a 100644 --- a/makefile +++ b/makefile @@ -145,7 +145,7 @@ stage7: $(ARCHIVE) *.o #$(ARCHIVE) objects $(LD) *.o - echo "$(PREFIX)/lib" >> 05vishap.conf + echo "$(PREFIX)/lib" > 05vishap.conf clean: # rm_objects := rm $(wildcard *.o) diff --git a/makefile.gnuc.armv6j b/makefile.gnuc.armv6j index 306abdfb..cee80f2d 100644 --- a/makefile.gnuc.armv6j +++ b/makefile.gnuc.armv6j @@ -144,7 +144,7 @@ stage7: $(ARCHIVE) *.o #$(ARCHIVE) objects $(LD) *.o - echo "$(PREFIX)/lib" >> 05vishap.conf + echo "$(PREFIX)/lib" > 05vishap.conf clean: # rm_objects := rm $(wildcard *.o) diff --git a/makefile.gnuc.armv6j_hardfp b/makefile.gnuc.armv6j_hardfp index 65593b17..dd17fc02 100644 --- a/makefile.gnuc.armv6j_hardfp +++ b/makefile.gnuc.armv6j_hardfp @@ -145,7 +145,7 @@ stage7: $(ARCHIVE) *.o #$(ARCHIVE) objects $(LD) *.o - echo "$(PREFIX)/lib" >> 05vishap.conf + echo "$(PREFIX)/lib" > 05vishap.conf clean: # rm_objects := rm $(wildcard *.o) diff --git a/makefile.gnuc.armv7a_hardfp b/makefile.gnuc.armv7a_hardfp index 29ef4520..21c8dbfa 100644 --- a/makefile.gnuc.armv7a_hardfp +++ b/makefile.gnuc.armv7a_hardfp @@ -145,7 +145,7 @@ stage7: $(ARCHIVE) *.o #$(ARCHIVE) objects $(LD) *.o - echo "$(PREFIX)/lib" >> 05vishap.conf + echo "$(PREFIX)/lib" > 05vishap.conf clean: # rm_objects := rm $(wildcard *.o) diff --git a/makefile.gnuc.x86 b/makefile.gnuc.x86 index e5964812..33cb1ac8 100644 --- a/makefile.gnuc.x86 +++ b/makefile.gnuc.x86 @@ -145,7 +145,7 @@ stage7: $(ARCHIVE) *.o #$(ARCHIVE) objects $(LD) *.o - echo "$(PREFIX)/lib" >> 05vishap.conf + echo "$(PREFIX)/lib" > 05vishap.conf clean: # rm_objects := rm $(wildcard *.o) diff --git a/ocat b/ocat index b5e6db88..ed9d6dde 100755 Binary files a/ocat and b/ocat differ diff --git a/showdef.REMOVED.git-id b/showdef.REMOVED.git-id index e443abdc..66408157 100644 --- a/showdef.REMOVED.git-id +++ b/showdef.REMOVED.git-id @@ -1 +1 @@ -3d280e4d53947c30f8b9f62d69afc61518f1f628 \ No newline at end of file +178817a94acd3bf196f05bcb739ee068c1004f3b \ No newline at end of file diff --git a/src/lib/ulm/ulmIO.Mod b/src/lib/ulm/ulmIO.Mod index 9516280b..2fa775e1 100644 --- a/src/lib/ulm/ulmIO.Mod +++ b/src/lib/ulm/ulmIO.Mod @@ -30,16 +30,27 @@ MODULE ulmIO; (* len is the minimal length of the generated string *) (* neg means: "the number is negative" for btyp = dec *) - CONST - NumberLen = 11; + (*CONST + NumberLen = 11;*) + (* we need it as variable to change the value depending on architecture; -- noch *) VAR - digits : ARRAY NumberLen+1 OF CHAR; + (*digits : ARRAY NumberLen+1 OF CHAR;*) + digits : POINTER TO ARRAY OF CHAR; base : INTEGER; cnt, ix : INTEGER; maxlen : LONGINT; dig : LONGINT; - + NumberLen : SHORTINT; BEGIN + + IF SIZE(LONGINT) = 4 THEN + NumberLen := 11 + ELSIF SIZE(LONGINT) = 8 THEN + NumberLen := 21 + ELSE + NumberLen := 11 (* default value, corresponds to 32 bit *) + END; + NEW(digits, NumberLen + 1 ); ASSERT(num >= 0); ix := 1; WHILE ix <= NumberLen DO @@ -103,11 +114,7 @@ MODULE ulmIO; CHAR); (* conversion of an integer decimal number to a string *) BEGIN - IF num = MIN(LONGINT) THEN - COPY("-2147483648", str); (* need fix, it's 32 bit only; -- noch *) - ELSE ConvertNumber(ABS(num),len,dec,num < 0,str); - END; END ConvertInteger; (* ========================= terminal ============================ *) @@ -180,13 +187,13 @@ MODULE ulmIO; END InitIO; PROCEDURE WriteInt*(arg: LONGINT); - VAR field: ARRAY 12 OF CHAR; - BEGIN + VAR field: ARRAY 23 OF CHAR; + BEGIN (* the field size should be big enough to hold the long number. it was 12 to hold just 32 bit numbers, now it can hold 64 bit numbers; need to be more for 128bit numbers; -- noch *) ConvertInteger(arg, 1, field); WriteString(field); END WriteInt; - PROCEDURE ReadInt*(VAR arg: INTEGER); + PROCEDURE ReadInt*(VAR arg: LONGINT); VAR ch: CHAR; minus: BOOLEAN; BEGIN diff --git a/voc.REMOVED.git-id b/voc.REMOVED.git-id index bda68376..b9365447 100644 --- a/voc.REMOVED.git-id +++ b/voc.REMOVED.git-id @@ -1 +1 @@ -7e50a6001dfae638682d5c84c73f327515cfcf01 \ No newline at end of file +9cdb3e113e99a63f2f5f5240dcbcea3d535979c1 \ No newline at end of file diff --git a/vocstatic.REMOVED.git-id b/vocstatic.REMOVED.git-id index bda68376..b9365447 100644 --- a/vocstatic.REMOVED.git-id +++ b/vocstatic.REMOVED.git-id @@ -1 +1 @@ -7e50a6001dfae638682d5c84c73f327515cfcf01 \ No newline at end of file +9cdb3e113e99a63f2f5f5240dcbcea3d535979c1 \ No newline at end of file