Changeset 12 for trunk/UBrainFuck.pas

Timestamp:

Feb 11, 2012, 4:32:27 PM (13 years ago)

Author:

chronos

Message:

• Added: Display source code caret position in statusbar.
• Modified: Optimized jump speed using precreated direct jump table.

Location:

trunk

Files:

• . (modified) (1 prop)
• UBrainFuck.pas (modified) (13 diffs)

trunk

@@ -3 +3 @@
 LazFuckIDE.lps
 backup
+LazFuckIDE

@@ -3 +3 @@
 LazFuckIDE.lps
 backup
+LazFuckIDE

trunk/UBrainFuck.pas

@@ -12 +12 @@
 
   TCompilerTarget = (ctDelphi);
+  TCompilerOptimization = (coNone, coNormal);
+
   { TBrainFuckCompiler }
 
@@ -23 +25 @@
     Output: string;
     Target: TCompilerTarget;
+    Optimization: TCompilerOptimization;
+    procedure OptimizeSource;
     procedure Compile;
   end;
@@ -43 +47 @@
     FThreadState: Boolean;
     FThread: TBrainFuckInterpretterThread;
+    FStepCount: Integer;
     procedure SetState(AValue: TRunState);
     procedure Write(Value: Byte);
@@ -48 +53 @@
     function ReadCode: Char;
     procedure SetThread(State: Boolean);
+    procedure PrepareJumpTable;
   public
-    Source: string;
+    Source: array of Char;
+    SourceJump: array of Integer;
     SourcePosition: Integer;
     Memory: array of Byte;
     MemoryPosition: Integer;
-    Loop: array of Integer;
-    LoopCurrent: Integer;
     Output: string;
     Input: string;
     InputPosition: Integer;
-    StepCount: Integer;
     procedure Reset;
     procedure SingleStep;
@@ -68 +72 @@
     property State: TRunState read FState;
     property OnChangeState: TNotifyEvent read FOnChangeState write FOnChangeState;
+    property StepCount: Integer read FStepCount;
   end;
 
@@ -77 +82 @@
   SProgramUpperLimit = 'Program run over upper limit';
   SReadInputError = 'Read input error';
+  SJumpTableInsistent = 'Jump table is inconsistent';
+  SJumpTableColision = 'Jump table colision';
 
 { TBrainFuckInterpretterThread }
@@ -118 +125 @@
 function TBrainFuckInterpretter.ReadCode: Char;
 begin
-  Result := Source[SourcePosition + 1]
+  Result := Source[SourcePosition];
 end;
 
@@ -135 +142 @@
 end;
 
+procedure TBrainFuckInterpretter.PrepareJumpTable;
+var
+  Loop: array of Integer;
+  LoopCurrent: Integer;
+  I: Integer;
+begin
+  SetLength(SourceJump, Length(Source));
+  FillChar(Pointer(SourceJump)^, Length(SourceJump), 0);
+  SetLength(Loop, 0);
+  for I := 0 to Length(Source) - 1 do begin
+    case Source[I] of
+      '[': begin
+        SetLength(Loop, Length(Loop) + 1);
+        Loop[High(Loop)] := I;
+      end;
+      ']': begin
+        if SourceJump[I] > 0 then raise Exception.Create(SJumpTableColision);
+        SourceJump[I] := Loop[High(Loop)];
+        if SourceJump[Loop[High(Loop)]] > 0 then raise Exception.Create(SJumpTableColision);
+        SourceJump[Loop[High(Loop)]] := I;
+        SetLength(Loop, Length(Loop) - 1);
+      end;
+    end;
+  end;
+  if Length(Loop) > 0 then raise Exception.Create(SJumpTableInsistent);
+end;
+
 procedure TBrainFuckInterpretter.Reset;
-var
-  I: Integer;
-begin
+begin
+  PrepareJumpTable;
   SourcePosition := 0;
   InputPosition := 0;
   Output := '';
   MemoryPosition := 0;
-  for I := 0 to Length(Memory) - 1 do
-    Memory[I] := 0;
-  SetLength(Loop, 0);
-  StepCount := 0;
+  FillChar(Pointer(Memory)^, Length(Memory), 0);
+  FStepCount := 0;
 end;
 
@@ -152 +183 @@
 var
   CodeText: string;
-  Code: Char;
   C: Integer;
+  NewPos: Integer;
 begin
   case ReadCode of
@@ -166 +197 @@
     '[': begin
       if Memory[MemoryPosition] = 0 then begin
-        C := 1;
+        SourcePosition := SourceJump[SourcePosition];
+        (*C := 1;
         Inc(SourcePosition);
         while C > 0 do begin
@@ -175 +207 @@
           Inc(SourcePosition);
         end;
-        Dec(SourcePosition);
+        Dec(SourcePosition);*)
+        //if NewPos <> SourcePosition then raise Exception.Create('Wrong pos: ' + IntToStr(SourcePosition) + ' ' + IntToStr(NewPos));
       end;
     end;
     ']': begin
       if Memory[MemoryPosition] > 0 then begin
-        C := 1;
+        SourcePosition := SourceJump[SourcePosition] - 1;
+        (*C := 1;
         Dec(SourcePosition);
         while C > 0 do begin
@@ -189 +223 @@
           Dec(SourcePosition);
         end;
+        if NewPos <> SourcePosition then raise Exception.Create('Wrong pos: ' + IntToStr(SourcePosition) + ' ' + IntToStr(NewPos));
+        *)
       end;
     end;
   end;
   Inc(SourcePosition);
-  Inc(StepCount);
+  Inc(FStepCount);
 end;
 
@@ -230 +266 @@
 begin
   Output := Output + DupeString('  ', Indent) + Text + LineEnding;
+end;
+
+procedure TBrainFuckCompiler.OptimizeSource;
+begin
+  // Remove redundand code
+
 end;
 

@@ -3 +3 @@
 LazFuckIDE.lps
 backup
+LazFuckIDE