return to working version

Author: tebe6502

origin/Common.pas

@@ -567,7 +567,7 @@   TIdentifier = record
   NumDefines: integer = 1;	// NumDefines = AddDefines
 
   NumTok, NumIdent, NumTypes, NumPredefIdent, NumStaticStrChars, NumUnits, NumBlocks, NumProc,
-  BlockStackTop, CodeSize, CodePosStackTop, BreakPosStackTop, _VarDataSize, Pass, ShrShlCnt,
+  BlockStackTop, CodeSize, CodePosStackTop, BreakPosStackTop, VarDataSize, Pass, ShrShlCnt,
   NumStaticStrCharsTmp, AsmBlockIndex, IfCnt, CaseCnt, IfdefLevel, run_func: Integer;
 
   iOut: integer = -1;
@@ -675,64 +675,12 @@   TIdentifier = record
 
 	function StrToInt(const a: string): Int64;
 
-        type TTokenIndex = Integer;
-        procedure IncVarDataSize(const tokenIndex: TTokenIndex; const size: Integer);
-
-        function GetVarDataSize: Integer;
-        procedure SetVarDataSize(const tokenIndex: TTokenIndex; const size: Integer);
-
-        var TraceFile: TextFile;
-        procedure LogTrace(message: String);
-
 // ----------------------------------------------------------------------------
 
 implementation
 
 uses SysUtils, Messages;
 
-procedure LogTrace(message: String);
-begin
-{$IFDEF USETRACEFILE}
-     Writeln(traceFile, message);
-{$ENDIF}
-end;
-
-// ----------------------------------------------------------------------------
-// ----------------------------------------------------------------------------
-
-function GetVarDataSize: Integer;
-begin
-  Result := _VarDataSize;
-end;
-
-
-procedure SetVarDataSize(const tokenIndex: TTokenIndex; const size: Integer);
-var token: TToken;
-// var  GetSourceFileLocationString: String;
-
-begin
-  _VarDataSize := size;
-  token:= Tok[tokenIndex];
-
-  (*
-  GetSourceFileLocationString := UnitName[ token.UnitIndex].Path;
-
-  if (token.line>0) then
-  begin
-   GetSourceFileLocationString:=GetSourceFileLocationString+ ' ( line ' + IntToStr(token.Line) + ', column ' + IntToStr(token.Column) + ')';
-  end;
-
-
-  // LogTrace(Format('SetVarDataSize: TokenIndex=%d: %s %s VarDataSize=%d', [tokenIndex, GetSourceFileLocationString,'TODO',   _VarDataSize]));
-  *)
-end;
-
-
-procedure IncVarDataSize(const tokenIndex: TTokenIndex; const size: Integer);
-begin
-  SetVarDataSize(tokenIndex, _VarDataSize + size);
-end;
-
 // ----------------------------------------------------------------------------
 
 

origin/Optimize.pas

@@ -1431,14 +1431,15 @@ procedure OptimizeEAX_OFF;
 
 
 {
-if (pos(#9'add #$00', listing[i]) > 0) then begin
+if (pos(#9'sub #$', listing[i]) > 0) then begin
 
       for p:=0 to l-1 do writeln(listing[p]);
       writeln('-------');
 
 end;
 }
 
+
     if opt_FORTMP(i) = false then begin Result := false; Break end;
 
 

origin/Parser.pas

@@ -455,9 +455,6 @@ procedure SaveToDataSegment(ConstDataSize: integer; ConstVal: Int64; ConstValTyp
 var ftmp: TFloat;
 begin
 
-// LogTrace(Format('SaveToDataSegment(index=%d, value=%d, valueDataType=%d', [ConstDataSize, ConstVal, ConstValType]));
-
-
 	if (ConstDataSize < 0) or (ConstDataSize > $FFFF) then begin writeln('SaveToDataSegment: ', ConstDataSize); halt end;
 
 	 ftmp:=Default(TFloat);
@@ -1750,10 +1747,10 @@ procedure DefineIdent(ErrTokenIndex: Integer; Name: TString; Kind: Byte; DataTyp
       if Ident[NumIdent].isAbsolute then
        Ident[NumIdent].Value := Data - 1
       else
-       Ident[NumIdent].Value := DATAORIGIN + GetVarDataSize;	// Variable address
+       Ident[NumIdent].Value := DATAORIGIN + VarDataSize;	// Variable address
 
       if not OutputDisabled then
-	IncVarDataSize( ErrTokenIndex,DataSize[DataType]);
+	VarDataSize := VarDataSize + DataSize[DataType];
 
       Ident[NumIdent].NumAllocElements := NumAllocElements;	// Number of array elements (0 for single variable)
       Ident[NumIdent].NumAllocElements_ := NumAllocElements_;
@@ -1763,28 +1760,28 @@ procedure DefineIdent(ErrTokenIndex: Integer; Name: TString; Kind: Byte; DataTyp
       if not OutputDisabled then begin
 
        if (DataType = POINTERTOK) and (AllocElementType in [RECORDTOK, OBJECTTOK]) and (NumAllocElements_ = 0) then
-         IncVarDataSize( ErrTokenIndex, DataSize[POINTERTOK])
+        inc(VarDataSize, DataSize[POINTERTOK])
        else
 
        if DataType in [ENUMTYPE] then
-        IncVarDataSize( ErrTokenIndex,1)
+        inc(VarDataSize)
        else
        if (DataType in [RECORDTOK, OBJECTTOK]) and (NumAllocElements > 0) then
-	IncVarDataSize( ErrTokenIndex, 0)
+	VarDataSize := VarDataSize + 0
        else
        if (DataType in [FILETOK, TEXTFILETOK]) and (NumAllocElements > 0) then
-	IncVarDataSize( ErrTokenIndex, 12)
+	VarDataSize := VarDataSize + 12
        else begin
 
         if (Ident[NumIdent].idType = ARRAYTOK) and (Ident[NumIdent].isAbsolute = false) and (Elements(NumIdent) = 1) then	// [0..0] ; [0..0, 0..0]
 
 	else
- 	  IncVarDataSize( ErrTokenIndex,  integer(Elements(NumIdent) * DataSize[AllocElementType]));
+ 	  VarDataSize := VarDataSize + integer(Elements(NumIdent) * DataSize[AllocElementType]);
 
        end;
 
 
-       if NumAllocElements > 0 then IncVarDataSize( ErrTokenIndex,-DataSize[DataType]);
+       if NumAllocElements > 0 then dec(VarDataSize, DataSize[DataType]);
 
       end;
 

origin/Scanner.pas

@@ -47,7 +47,7 @@ procedure TokenizeProgramInitialization;
  SetLength(msgWarning, 1);
  SetLength(msgNote, 1);
 
- NumBlocks := 0; BlockStackTop := 0; CodeSize := 0; CodePosStackTop := 0; SetVarDataSize(0,0);
+ NumBlocks := 0; BlockStackTop := 0; CodeSize := 0; CodePosStackTop := 0; VarDataSize := 0;
  CaseCnt := 0; IfCnt := 0; ShrShlCnt := 0; NumTypes := 0; run_func := 0; NumProc := 0;
  NumTok := 0; NumIdent := 0;
 

origin/define.inc

@@ -1,11 +1,7 @@
 //{$DEFINE WHILEDO}
 
 //{$DEFINE USEOPTFILE}
-//{$DEFINE USETRACEFILE}
 
 {$DEFINE OPTIMIZECODE}
 
-// The origin version still relies on accessing the element [0] of arrays starting at 1.
-{$RANGECHECKS OFF}
-
 {$I+}