Changeset 25 for branches/AS8051toC/UMainForm.pas

Timestamp:

Oct 15, 2012, 12:00:21 PM (12 years ago)

Author:

chronos

Message:

• Upraveno: Rozšířeno převádění kódu na další případy.

File:

• branches/AS8051toC/UMainForm.pas (modified) (17 diffs)

branches/AS8051toC/UMainForm.pas

@@ -17 +17 @@
     ButtonConvert: TButton;
     EditPath: TEdit;
+    OpenDialog1: TOpenDialog;
     SynCppSyn1: TSynCppSyn;
     SynMemo1: TSynMemo;
@@ -26 +27 @@
     procedure FormShow(Sender: TObject);
   private
-    Parser: TParser;
+    Parser: TParserASM51;
   public
     MainFile: TStringList;
@@ -32 +33 @@
     Output: string;
     Macros: TStringList;
+    function IsHexNumber(Text: string): Boolean;
+    function CheckInstructionParameter: Boolean;
     procedure Emit(Text: string);
     procedure Error(Text: string);
@@ -66 +69 @@
 
 procedure TFormMain.ButtonConvertClick(Sender: TObject);
-var
-  Path: string;
-begin
-  Path := 'h:\Projekty\E341\Repository\trunk';
-  MainFile.LoadFromFile(Path + DirectorySeparator + 'main.a51');
+begin
+  MainFile.LoadFromFile(EditPath.Text);
   Parser.Source := LowerCase(MainFile.Text);
   Parser.Position := 1;
@@ -76 +76 @@
   Parse;
   MainFileOut.Text := Output;
-  ForceDirectoriesUTF8(Path + DirectorySeparator + 'C');
-  MainFileOut.SaveToFile(Path + DirectorySeparator + 'C' +
+  ForceDirectoriesUTF8(ExtractFileDir(EditPath.Text) + DirectorySeparator + 'C');
+  MainFileOut.SaveToFile(ExtractFileDir(EditPath.Text) + DirectorySeparator + 'C' +
     DirectorySeparator + 'main.c');
   SynMemo1.Lines.Assign(MainFileOut);
@@ -86 +86 @@
   Dir: string;
 begin
-  if SelectDirectory('Výběr adresáře', EditPath.Text, Dir) then
-    EditPath.Text := Dir;
+  OpenDialog1.FileName := EditPath.Text;
+  if OpenDialog1.Execute then begin
+    EditPath.Text := OpenDialog1.FileName;
+  end;
 end;
 
 procedure TFormMain.FormCreate(Sender: TObject);
 begin
-  Parser := TParser.Create;
+  Parser := TParserASM51.Create;
   Parser.OnError := Error;
   MainFile := TStringList.Create;
@@ -111 +113 @@
   ButtonConvertClick(Self);
   //Close;
+end;
+
+function TFormMain.IsHexNumber(Text: string): Boolean;
+begin
+  Result := (LowerCase(Copy(Text, Length(Text), 1)) = 'h') and
+    (Parser.IsHexNumber(Copy(Text, 1, Length(Text) - 1)));
+end;
+
+function TFormMain.CheckInstructionParameter: Boolean;
+begin
+  Text := Parser.GetNext;
+  Result := False;
+  if Parser.IsNumber(Text) then Result := True
+  else if Text = '#' then begin
+    Result := True;
+    Parser.Expect('#');
+    if IsHexNumber(Parser.GetNext) then Emit(Parser.ReadNext)
+    else if Parser.IsNumber(Parser.GetNext) then Emit(Parser.ReadNext)
+    else Error('Invalid parameter');
+  end
+  else if Copy(Text, 1, 1) = '@' then begin
+    if IsHexNumber(Copy(Text, 2, Length(Text))) then Result := True;
+    Emit(Parser.ReadNext);
+  end;
 end;
 
@@ -176 +202 @@
     end
     else if ParseComment then
-    else if ParseMacro then
     else if ParseKeywords then
     else if ParseInstruction then
@@ -200 +225 @@
       end else Error('Unexpected token "' + Variable + '"');
     end
+    else if ParseMacro then
+    else if ParseMacroUsage then
     else Error('Unexpected token "' + GetNext + '"');
     Emit(LineEnding);
@@ -208 +235 @@
 var
   MacroName: string;
-begin
-  with Parser do begin
+  OldPos: Integer;
+begin
+  with Parser do begin
+    OldPos := Position;
     if GetNext = '%' then begin
       Result := True;
@@ -269 +298 @@
           Expect('(');
         end;
-      end;// else Error('Unknown macro: ' + ReadNext);
+      end else begin
+        Position := OldPos;
+        Result := False;
+      end;
     end else Result := False;
   end;
@@ -299 +331 @@
         Expect('(');
         Emit('(');
-        if ParseMacroUsage then
-          else Emit(ReadNext);
+        ParseDbExpression;
+        //else Emit(ReadNext);
         while GetNext = ',' do begin
           Expect(',');
           Emit(',');
-          if ParseMacroUsage then
-            else Emit(ReadNext);
+          ParseDbExpression;
+          //if ParseMacroUsage then
+          //else if GetNext <> ')' then Emit(ReadNext);
         end;
         Emit(')');
@@ -339 +372 @@
         ReadNext;
       end;
+    end else
+    if GetNext = 'using' then begin
+      Result := True;
+      Expect('using');
+      Value := ReadNext;
+      Emit('// using reg bank ' + Value);
     end else
     if GetNext = 'cseg' then begin
@@ -411 +450 @@
       Emit(';');
     end else
+    if GetNext = 'mov' then begin
+      Expect('mov');
+      Result := True;
+      Emit('MOV(');
+      ParseDbExpression;
+      Expect(',');
+      Emit(',');
+      ParseDbExpression;
+      Emit(');');
+    end else
     if GetNext = 'reti' then begin
       Result := True;
@@ -457 +506 @@
         Emit('&& ');
       end else
-      Error('Unknown operand "' + ReadNext + '"');
+        Error('Unknown operand "' + ReadNext + '"');
       if ParseMacroUsage then
       else if IsNumber(GetNext) then Emit(ReadNext)
@@ -482 +531 @@
     end
     else if GetNext = '''' then Emit('"' + ParseString + '"')
-    else if IsNumber(GetNext) then Emit(ReadNext)
-    else if IsIdentificator(GetNext) then Emit(ReadNext)
-    else Error('Unknown IF parameter "' + GetNext + '"');
+    else if CheckInstructionParameter then
+    else if IsIdentificator(GetNext) then begin
+      Emit(ReadNext);
+      if ParseMacroUsage then ;
+    end else Error('Unknown IF parameter "' + GetNext + '"');
 
     if GetNext = '+' then begin
@@ -504 +555 @@
       Expect('/');
       Emit('/');
+      ParseDbExpression;
+    end else
+    if GetNext = 'shl' then begin
+      Expect('shl');
+      Emit('<< ');
+      ParseDbExpression;
+    end else
+    if GetNext = 'shr' then begin
+      Expect('shr');
+      Emit('>> ');
       ParseDbExpression;
     end else