diff --git a/src/lib/v4/armv6j/Reals.Mod b/src/lib/v4/armv6j/Reals.Mod index e752c0c9..087767c1 100644 --- a/src/lib/v4/armv6j/Reals.Mod +++ b/src/lib/v4/armv6j/Reals.Mod @@ -5,7 +5,7 @@ MODULE Reals; PROCEDURE -ecvt (x: LONGREAL; ndigit, decpt, sign: LONGINT): LONGINT - "ecvt (x, ndigit, decpt, sign)"; + "(LONGINT)ecvt (x, ndigit, decpt, sign)"; PROCEDURE Ten*(e: INTEGER): REAL; VAR r, power: LONGREAL; diff --git a/src/lib/v4/armv6j_hardfp/Reals.Mod b/src/lib/v4/armv6j_hardfp/Reals.Mod index e752c0c9..087767c1 100644 --- a/src/lib/v4/armv6j_hardfp/Reals.Mod +++ b/src/lib/v4/armv6j_hardfp/Reals.Mod @@ -5,7 +5,7 @@ MODULE Reals; PROCEDURE -ecvt (x: LONGREAL; ndigit, decpt, sign: LONGINT): LONGINT - "ecvt (x, ndigit, decpt, sign)"; + "(LONGINT)ecvt (x, ndigit, decpt, sign)"; PROCEDURE Ten*(e: INTEGER): REAL; VAR r, power: LONGREAL; diff --git a/src/lib/v4/armv7a_hardfp/Reals.Mod b/src/lib/v4/armv7a_hardfp/Reals.Mod index e752c0c9..087767c1 100644 --- a/src/lib/v4/armv7a_hardfp/Reals.Mod +++ b/src/lib/v4/armv7a_hardfp/Reals.Mod @@ -5,7 +5,7 @@ MODULE Reals; PROCEDURE -ecvt (x: LONGREAL; ndigit, decpt, sign: LONGINT): LONGINT - "ecvt (x, ndigit, decpt, sign)"; + "(LONGINT)ecvt (x, ndigit, decpt, sign)"; PROCEDURE Ten*(e: INTEGER): REAL; VAR r, power: LONGREAL; diff --git a/src/lib/v4/powerpc/Reals.Mod b/src/lib/v4/powerpc/Reals.Mod index 7c022122..037cba38 100644 --- a/src/lib/v4/powerpc/Reals.Mod +++ b/src/lib/v4/powerpc/Reals.Mod @@ -5,7 +5,7 @@ MODULE Reals; PROCEDURE -ecvt (x: LONGREAL; ndigit, decpt, sign: LONGINT): LONGINT - "ecvt (x, ndigit, decpt, sign)"; + "(LONGINT)ecvt (x, ndigit, decpt, sign)"; PROCEDURE Ten*(e: INTEGER): REAL; VAR r, power: LONGREAL; diff --git a/src/lib/v4/x86/Reals.Mod b/src/lib/v4/x86/Reals.Mod index e752c0c9..087767c1 100644 --- a/src/lib/v4/x86/Reals.Mod +++ b/src/lib/v4/x86/Reals.Mod @@ -5,7 +5,7 @@ MODULE Reals; PROCEDURE -ecvt (x: LONGREAL; ndigit, decpt, sign: LONGINT): LONGINT - "ecvt (x, ndigit, decpt, sign)"; + "(LONGINT)ecvt (x, ndigit, decpt, sign)"; PROCEDURE Ten*(e: INTEGER): REAL; VAR r, power: LONGREAL; diff --git a/src/lib/v4/x86_64/Reals.Mod b/src/lib/v4/x86_64/Reals.Mod index 8a7c3212..16fede64 100644 --- a/src/lib/v4/x86_64/Reals.Mod +++ b/src/lib/v4/x86_64/Reals.Mod @@ -3,10 +3,9 @@ MODULE Reals; IMPORT S := SYSTEM; -(* PROCEDURE -ecvt (x: LONGREAL; ndigit, decpt, sign: LONGINT): LONGINT - "ecvt (x, ndigit, decpt, sign)"; -*) + "(LONGINT)ecvt (x, ndigit, decpt, sign)"; + PROCEDURE Ten*(e: INTEGER): REAL; VAR r, power: LONGREAL; BEGIN r := 1.0; @@ -65,7 +64,7 @@ MODULE Reals; d[k] := CHR(i MOD 10 + 48); i := i DIV 10; INC(k) END END Convert; - +(* PROCEDURE ConvertL*(x: LONGREAL; n: INTEGER; VAR d: ARRAY OF CHAR); VAR i, k: LONGINT; BEGIN @@ -74,8 +73,7 @@ MODULE Reals; d[k] := CHR(i MOD 10 + 48); i := i DIV 10; INC(k) END END ConvertL; - -(* (*commented because ecvt returns smth strange on x86_64, may be types must be checked, but anyway, getting rid of libc dependency is good *) + *) PROCEDURE ConvertL*(x: LONGREAL; n: INTEGER; VAR d: ARRAY OF CHAR); VAR decpt, sign, i: LONGINT; buf: LONGINT; BEGIN @@ -86,7 +84,7 @@ MODULE Reals; i := n - i - 1; WHILE i >= 0 DO d[i] := "0"; DEC(i) END ; END ConvertL; -*) + PROCEDURE Unpack(VAR b, d: ARRAY OF S.BYTE); VAR i, k: SHORTINT; len: LONGINT; BEGIN i := 0; len := LEN(b); diff --git a/voc.REMOVED.git-id b/voc.REMOVED.git-id index 76ffd557..df5f3d7a 100644 --- a/voc.REMOVED.git-id +++ b/voc.REMOVED.git-id @@ -1 +1 @@ -ecc8a9a5e3415d5077353c2003a7a8751125df3e \ No newline at end of file +ea3eeab60e2534238860b93b768a164507a37366 \ No newline at end of file diff --git a/vocstatic.linux.gcc.x86_64.REMOVED.git-id b/vocstatic.linux.gcc.x86_64.REMOVED.git-id index af44ce56..df5f3d7a 100644 --- a/vocstatic.linux.gcc.x86_64.REMOVED.git-id +++ b/vocstatic.linux.gcc.x86_64.REMOVED.git-id @@ -1 +1 @@ -90416871552aca31fdc4f4df787d5ad56448ca5d \ No newline at end of file +ea3eeab60e2534238860b93b768a164507a37366 \ No newline at end of file