Changeset 62

Timestamp:

Aug 1, 2024, 11:00:58 PM (4 months ago)

Author:

chronos

Message:

• Modified: Assembler syntax highlight.

Location:

branches/ByteArray

Files:

• Asm (added)
• Asm/Api.asm (added)
• Asm/Apps (added)
• Asm/Apps/Beep.asm (added)
• Asm/Apps/Halt.asm (added)
• Asm/Apps/Shell.asm (added)
• Asm/Apps/Write.asm (added)
• Asm/Combined.asm (added)
• Asm/Io.asm (added)
• Asm/Kernel.asm (added)
• Asm/SysCalls.asm (added)
• ByteArray.lpi (modified) (1 diff)
• ByteArray.lpr (modified) (1 diff)
• Cpu.pas (modified) (1 diff)
• Forms/AsmHighlighter.pas (added)
• Forms/FormAssembler.lfm (modified) (4 diffs)
• Forms/FormAssembler.lrj (added)
• Forms/FormAssembler.pas (modified) (3 diffs)
• Languages/ByteArray.cs.po (modified) (2 diffs)
• Languages/ByteArray.pot (modified) (1 diff)
• VarInt.pas (added)

branches/ByteArray/ByteArray.lpi

@@ -241 +241 @@
         <ResourceBaseClass Value="Form"/>
       </Unit>
+      <Unit>
+        <Filename Value="CpuInstructions.txt"/>
+        <IsPartOfProject Value="True"/>
+      </Unit>
+      <Unit>
+        <Filename Value="Asm/Api.asm"/>
+        <IsPartOfProject Value="True"/>
+      </Unit>
+      <Unit>
+        <Filename Value="Asm/Combined.asm"/>
+        <IsPartOfProject Value="True"/>
+      </Unit>
+      <Unit>
+        <Filename Value="Asm/Io.asm"/>
+        <IsPartOfProject Value="True"/>
+      </Unit>
+      <Unit>
+        <Filename Value="Asm/Kernel.asm"/>
+        <IsPartOfProject Value="True"/>
+      </Unit>
+      <Unit>
+        <Filename Value="Asm/SysCalls.asm"/>
+        <IsPartOfProject Value="True"/>
+      </Unit>
+      <Unit>
+        <Filename Value="Asm/Apps/Beep.asm"/>
+        <IsPartOfProject Value="True"/>
+      </Unit>
+      <Unit>
+        <Filename Value="Asm/Apps/Halt.asm"/>
+        <IsPartOfProject Value="True"/>
+      </Unit>
+      <Unit>
+        <Filename Value="Asm/Apps/Shell.asm"/>
+        <IsPartOfProject Value="True"/>
+      </Unit>
+      <Unit>
+        <Filename Value="Asm/Apps/Write.asm"/>
+        <IsPartOfProject Value="True"/>
+      </Unit>
+      <Unit>
+        <Filename Value="VarInt.pas"/>
+        <IsPartOfProject Value="True"/>
+      </Unit>
     </Units>
   </ProjectOptions>

branches/ByteArray/ByteArray.lpr

@@ -13 +13 @@
   Storage, DeviceMapper, Machine, Disassembler, Instructions, Parser, Message,
   Assembler, Serial, Mouse, FormSourceEditor, FormMessages, FormMemory,
-  FormStorage, Common, FormSettings, Core, FormDebugger
+  FormStorage, Common, FormSettings, Core, FormDebugger, VarInt
   { you can add units after this };
 

branches/ByteArray/Cpu.pas

@@ -806 +806 @@
 end.
 
-
-32-bit
-
-LD       A, B
-LD       A1, B1
-LD       A2, $aabb
-LD       A2, (B2)
-LD       A2, ($ffff)
-LD       A.2, ($00ff.2)
-LD.2.2   A2, ($ffff)
-JR.128   $ff
-LD       (A2), (B2)
-LD       (n.1), (n.1)
-LD       (n.1), (n.1)
-
-LD       A, B
-LD2      A, B
-LD       A2, B2
-LD.2     A, n
-LD       A, (B)
-LD.1     A, (n)
-IN.1     A, (n)
-IN.1     A, (B)
-JP       n
-JP.1     n
-JR       n
-JR.1     n
-PUSH     A
-PUSH.1   A
-PUSH.4   A
-PUSH.128 A
-RET
-LD.2     (A), (B)
-INC      A
-LD.1     A, n
-SHL.2    A
-LD.1     A, n
-AND.2    A, n
-LD.2     B, A
-IN       C, (B)
-IN.d1.a1 C, (B)
-CALL     n
-CALL.4   n
-LD       A, (B + n)
-LD.1.2.1 A, (B + n)
-LD.d1.a2.r1 A, (B + n)
-LD       A, (B + n)
-LDIR     A, B, C
-LDIR.4   (A), (B), C
-LDI      (A), (B), C
-SET.4    A, 20
-
-- bit index 2048 (256 * 8) (8 + 3) bits = 2^11
-
-LD   R0, R1
-LD2  R0, R1
-LD.2 R0, R1
-LD:2 R0, R1
-LD   D2, R0, R1
-LD   D2, A16, R0, (R1)
-LD   D2:A16: R0, (R1)
-RET
-RET2
-RET.2
-RET:2
-RET  A2
-PUSH   R0
-PUSH2  R0
-PUSH.2 R0
-PUSH:2 R0
-PUSH   D2, R0
-PUSH   D2:R0
-PUSH   R0.2
-PUSH   R0:2
-LD     (R0), (R2)
-LD     D1, A2, (R0), (R2)
-LDIR   (R0), (R1), R2
-LDIR   D1, A2, (R0), (R1), R2
-LDI
-OUT    (R0), R1
-OUT    D1, (R0), R1
-OUT    D1, A2, (R0), R1
-
-
-
-  LD   A, TEXT
-  CALL PRINT
-
-:PRINT
-  PUSH B
-:PRINT_START
-  LD   B, (A)
-  TEST B
-  JR   Z, PRINT_END
-  OUT  (n), B
-  INC  A
-  JR   PRINT_START
-:PRINT_END
-  POP  B
-  RET
-

branches/ByteArray/Forms/FormAssembler.lfm

@@ -1 +1 @@
 object FormAssembler: TFormAssembler
-  Left = 728
+  Left = 727
   Height = 719
-  Top = 384
+  Top = 360
   Width = 1106
   Caption = 'Assembler'
@@ -8 +8 @@
   ClientWidth = 1106
   DesignTimePPI = 144
+  OnCreate = FormCreate
+  OnDestroy = FormDestroy
   LCLVersion = '2.2.6.0'
   inline SynEdit1: TSynEdit
@@ -28 +30 @@
     RightGutter.Width = 0
     RightGutter.MouseActions = <>
+    Highlighter = SynAnySyn1
     Keystrokes = <    
       item
@@ -513 +516 @@
   object SynAnySyn1: TSynAnySyn
     Enabled = False
-    Comments = []
+    CommentAttri.Foreground = clGreen
+    Comments = [csAsmStyle]
     DetectPreprocessor = False
     IdentifierChars = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ_abcdefghijklmnopqrstuvwxyz'
+    KeyAttri.Foreground = clYellow
+    NumberAttri.Foreground = clFuchsia
     Markup = False
     Entity = False

branches/ByteArray/Forms/FormAssembler.pas

@@ -4 +4 @@
 
 uses
-  Classes, SysUtils, Forms, Controls, Graphics, Dialogs, AsyncProcess, SynEdit,
-  SynHighlighterAny, SynHighlighterMulti, Common.FormEx;
+  Classes, SysUtils, Forms, Controls, Graphics, Dialogs, SynEdit,
+  SynHighlighterAny, SynHighlighterMulti, Common.FormEx, Generics.Collections;
 
 type
@@ -14 +14 @@
     SynAnySyn1: TSynAnySyn;
     SynEdit1: TSynEdit;
+    procedure FormCreate(Sender: TObject);
+    procedure FormDestroy(Sender: TObject);
+  private
   public
     procedure Select(Position: TPoint);
@@ -23 +26 @@
 {$R *.lfm}
 
+uses
+  Instructions;
+
 { TFormAssembler }
+
+procedure TFormAssembler.FormCreate(Sender: TObject);
+var
+  InstructionInfos: TInstructionInfos;
+  Keywords: TList<string>;
+  I: Integer;
+begin
+  Keywords := TList<string>.Create;
+  InstructionInfos := TInstructionInfos.Create;
+  InstructionInfos.Init;
+  for I := 0 to InstructionInfos.Count - 1 do
+    if not Keywords.Contains(InstructionInfos[I].Name) then
+      Keywords.Add(InstructionInfos[I].Name);
+  for I := 0 to Keywords.Count - 1 do
+    SynAnySyn1.KeyWords.Add(Keywords[I]);
+  SynAnySyn1.KeyWords.Add('VAR');
+  SynAnySyn1.KeyWords.Add('DB');
+  SynAnySyn1.KeyWords.Add('ORG');
+  FreeAndNil(InstructionInfos);
+  FreeAndNil(Keywords);
+end;
+
+procedure TFormAssembler.FormDestroy(Sender: TObject);
+begin
+end;
 
 procedure TFormAssembler.Select(Position: TPoint);

branches/ByteArray/Languages/ByteArray.cs.po

@@ -188 +188 @@
 msgstr "Úložiště"
 
+#: tformassembler.caption
+msgid "Assembler"
+msgstr ""
+
 #: tformdebugger.caption
 msgctxt "tformdebugger.caption"
@@ -383 +387 @@
 msgid "ASCII"
 msgstr "ASCII"
+

branches/ByteArray/Languages/ByteArray.pot

@@ -178 +178 @@
 msgstr ""
 
+#: tformassembler.caption
+msgid "Assembler"
+msgstr ""
+
 #: tformdebugger.caption
 msgctxt "tformdebugger.caption"