diff --git a/Cambios.txt b/Cambios.txt
index ccae3e3..dc29ee1 100644
--- a/Cambios.txt
+++ b/Cambios.txt
@@ -3,7 +3,8 @@
04/09/2020: Se mueve el método FindOpcode() fuera del objeto TP6502Instruct.
22/10/2020: Se agrega protección de dirección excesiva, a TCPUCore.addTopLabel().
23/10/2020: Se crea la bandera pic.disableCodegen.
-03/03/2022: Se agrega TP6502Instruct.HasOpcode() y se corrige TP6502.Decode().
+03/03/2022: Se agrega TP6502Instruct.HasOpcode(), se corrige TP6502.Decode() y se
+modifica el tipo optCycles en TP6502Instruct.AddAddressMode().
0.4
diff --git a/MiniAssembler/project1.lps b/MiniAssembler/project1.lps
index b79f23d..cb90bdb 100644
--- a/MiniAssembler/project1.lps
+++ b/MiniAssembler/project1.lps
@@ -22,17 +22,16 @@
-
-
+
+
-
-
-
+
+
@@ -42,8 +41,8 @@
-
-
+
+
@@ -58,7 +57,7 @@
-
+
@@ -101,10 +100,93 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/MiniAssembler/unit1.lfm b/MiniAssembler/unit1.lfm
index 85fcd4a..9d5bcc2 100644
--- a/MiniAssembler/unit1.lfm
+++ b/MiniAssembler/unit1.lfm
@@ -1,55 +1,61 @@
object Form1: TForm1
Left = 265
- Height = 368
+ Height = 460
Top = 159
- Width = 530
+ Width = 662
Caption = 'Form1'
- ClientHeight = 368
- ClientWidth = 530
+ ClientHeight = 460
+ ClientWidth = 662
+ DesignTimePPI = 120
OnCreate = FormCreate
OnDestroy = FormDestroy
- LCLVersion = '2.0.4.0'
+ LCLVersion = '2.0.12.0'
object Memo1: TMemo
- Left = 10
- Height = 312
- Top = 40
- Width = 190
+ Left = 12
+ Height = 390
+ Top = 50
+ Width = 238
Lines.Strings = (
'LDA'
'STA $10'
)
+ ParentFont = False
TabOrder = 0
end
object Button1: TButton
- Left = 216
- Height = 25
- Top = 40
- Width = 88
+ Left = 270
+ Height = 31
+ Top = 50
+ Width = 110
Caption = 'Assemble>>'
OnClick = Button1Click
+ ParentFont = False
TabOrder = 1
end
object Memo2: TMemo
- Left = 320
- Height = 312
- Top = 40
- Width = 190
+ Left = 400
+ Height = 390
+ Top = 50
+ Width = 238
+ ParentFont = False
TabOrder = 2
end
object Label1: TLabel
- Left = 10
- Height = 15
- Top = 10
- Width = 31
+ Left = 12
+ Height = 20
+ Top = 12
+ Width = 39
Caption = 'CODE'
ParentColor = False
+ ParentFont = False
end
object Label2: TLabel
- Left = 328
- Height = 15
- Top = 10
- Width = 46
+ Left = 410
+ Height = 20
+ Top = 12
+ Width = 58
Caption = 'HEX FILE'
ParentColor = False
+ ParentFont = False
end
end
diff --git a/MiniAssembler/unit1.pas b/MiniAssembler/unit1.pas
index 24d35d6..d5aadad 100644
--- a/MiniAssembler/unit1.pas
+++ b/MiniAssembler/unit1.pas
@@ -120,8 +120,7 @@ begin
exit;
end;
//Find mnemonic, and parameters
- idInst := pic.FindOpcode(Inst);
- if idInst = i_Inval then begin
+ if not FindOpcode(Inst, idInst) then begin
Application.MessageBox(PChar('Invalid Opcode: '+ Inst),'');
exit;
end;
@@ -169,7 +168,7 @@ begin
end;
end;
pic.GenHex(Application.ExeName + '.hex');
- Memo2.Lines.LoadFromFile(Application.ExeName + '.hex');
+ Memo2.Lines.LoadFromFile(Application.ExeName + '.hex'); //*** This is binary. Show nothing.
end;
procedure TForm1.FormCreate(Sender: TObject);