Changeset 51

Timestamp:

Nov 3, 2023, 11:15:31 AM (13 months ago)

Author:

chronos

Message:

• Fixed: Show data content of storage file.

Location:

branches/ByteArray

Files:

• . (modified) (1 prop)
• BigInt.pas (modified) (1 diff)
• Devices/Memory.pas (modified) (2 diffs)
• Devices/Storage.pas (modified) (2 diffs)
• Forms/FormStorage.lfm (modified) (2 diffs)
• Forms/FormStorage.lrj (modified) (1 diff)
• Forms/FormStorage.pas (modified) (1 diff)
• Languages (modified) (1 prop)
• Languages/ByteArray.cs.po (modified) (8 diffs)
• Languages/ByteArray.pot (modified) (2 diffs)
• Storage.dat (deleted)

branches/ByteArray

@@ -6 +6 @@
 ByteArray.res
 ByteArray.dbg
+Storage.dat

@@ -6 +6 @@
 ByteArray.res
 ByteArray.dbg
+Storage.dat

branches/ByteArray/BigInt.pas

@@ -184 +184 @@
 class operator TBigInt.Implicit(A: TBigInt): UInt64;
 begin
-  if A.Size = 8 then Result := PUInt64(@A.FData[0])^
-    else raise Exception.Create(SUnsupportedByteSize);
+  if A.Size = 1 then Result := PUInt8(@A.FData[0])^
+  else if A.Size = 2 then Result := PUInt16(@A.FData[0])^
+  else if A.Size = 4 then Result := PUInt32(@A.FData[0])^
+  else if A.Size = 8 then Result := PUInt64(@A.FData[0])^
+  else raise Exception.Create(SUnsupportedByteSize);
 end;
 
 class operator TBigInt.Implicit(A: TBigInt): Int64;
 begin
-  if A.Size = 8 then Result := PInt64(@A.FData[0])^
-    else raise Exception.Create(SUnsupportedByteSize);
+  if A.Size = 1 then Result := PInt8(@A.FData[0])^
+  else if A.Size = 2 then Result := PInt16(@A.FData[0])^
+  else if A.Size = 4 then Result := PInt32(@A.FData[0])^
+  else if A.Size = 8 then Result := PInt64(@A.FData[0])^
+  else raise Exception.Create(SUnsupportedByteSize);
 end;
 

branches/ByteArray/Devices/Memory.pas

@@ -71 +71 @@
 begin
   Result := Read(Position, ASize);
+  Inc(Position, ASize);
 end;
 
@@ -87 +88 @@
 begin
   Write(Position, ASize, Value);
+  Inc(Position, ASize);
 end;
 

branches/ByteArray/Devices/Storage.pas

@@ -19 +19 @@
     FFile: TFileStream;
     Position: Integer;
+    function ReadByte(Address: TBigInt): Byte;
     function Read(Address: TBigInt; Size: TBigIntSize): TBigInt;
     procedure Write(Address: TBigInt; Size: TBigIntSize; Value: TBigInt);
@@ -53 +54 @@
 begin
   FFile.Size := AValue;
+end;
+
+function TStorage.ReadByte(Address: TBigInt): Byte;
+begin
+  Result := 0;
+  FFile.Position := Address;
+  FFile.Read(Result, 1);
 end;
 

branches/ByteArray/Forms/FormStorage.lfm

@@ -13 +13 @@
     Left = 17
     Height = 721
-    Top = 19
+    Top = 16
     Width = 1127
     Anchors = [akTop, akLeft, akRight, akBottom]
@@ -19 +19 @@
       item
         Caption = 'Address'
-        Width = 100
+        Width = 120
       end    
       item
         Caption = 'Data'
-        Width = 1012
+        Width = 643
+      end    
+      item
+        Caption = 'ASCII'
+        Width = 349
       end>
     OwnerData = True

branches/ByteArray/Forms/FormStorage.lrj

@@ -2 +2 @@
 {"hash":179734405,"name":"tformstorage.caption","sourcebytes":[83,116,111,114,97,103,101],"value":"Storage"},
 {"hash":128683235,"name":"tformstorage.listview1.columns[0].caption","sourcebytes":[65,100,100,114,101,115,115],"value":"Address"},
-{"hash":305313,"name":"tformstorage.listview1.columns[1].caption","sourcebytes":[68,97,116,97],"value":"Data"}
+{"hash":305313,"name":"tformstorage.listview1.columns[1].caption","sourcebytes":[68,97,116,97],"value":"Data"},
+{"hash":4618201,"name":"tformstorage.listview1.columns[2].caption","sourcebytes":[65,83,67,73,73],"value":"ASCII"}
 ]}

branches/ByteArray/Forms/FormStorage.pas

@@ -44 +44 @@
     Text := '';
     for I := 0 to ItemsPerLine - 1 do begin
-      One := Storage.Read(Item.Index * ItemsPerLine + I, 1);
+      One := Storage.ReadByte(Item.Index * ItemsPerLine + I);
       Line := Line + IntToHex(One, 2) + ' ';
       if One >= 32 then Text := Text + Char(One)

branches/ByteArray/Languages/ByteArray.cs.po

@@ -17 +17 @@
 
 #: device.sconsole
-#, fuzzy
 msgctxt "device.sconsole"
 msgid "Console"
@@ -24 +23 @@
 #: device.skeyboard
 msgid "Keyboard"
-msgstr ""
+msgstr "Klávesnice"
 
 #: device.smouse
 msgid "Mouse"
-msgstr ""
+msgstr "Myš"
 
 #: device.snone
 msgid "None"
-msgstr ""
+msgstr "Žádné"
 
 #: device.sscreen
 msgctxt "device.sscreen"
 msgid "Screen"
-msgstr ""
+msgstr "Obrazovka"
 
 #: device.sstorage
 msgctxt "device.sstorage"
 msgid "Storage"
-msgstr ""
+msgstr "Úložiště"
 
 #: device.stimer
 msgid "Timer"
-msgstr ""
+msgstr "Časovač"
 
 #: memory.soutofrange
@@ -58 +57 @@
 
 #: tformmain.aconsole.caption
-#, fuzzy
 msgctxt "tformmain.aconsole.caption"
 msgid "Console"
@@ -90 +88 @@
 
 #: tformmain.ascreen.caption
-#, fuzzy
 msgctxt "tformmain.ascreen.caption"
 msgid "Screen"
@@ -101 +98 @@
 
 #: tformmain.astorage.caption
-#, fuzzy
 msgctxt "tformmain.astorage.caption"
 msgid "Storage"
@@ -124 +120 @@
 
 #: tformmemory.caption
-#, fuzzy
 msgctxt "tformmemory.caption"
 msgid "Memory"
@@ -132 +127 @@
 msgctxt "tformmemory.listviewmemory.columns[0].caption"
 msgid "Address"
-msgstr ""
+msgstr "Adresa"
 
 #: tformmemory.listviewmemory.columns[1].caption
 msgctxt "tformmemory.listviewmemory.columns[1].caption"
 msgid "Data"
-msgstr ""
+msgstr "Data"
 
 #: tformmemory.listviewmemory.columns[2].caption
+msgctxt "tformmemory.listviewmemory.columns[2].caption"
 msgid "ASCII"
-msgstr ""
+msgstr "ASCII"
 
 #: tformsourceeditor.aclose.caption
@@ -223 +219 @@
 msgctxt "tformstorage.caption"
 msgid "Storage"
-msgstr ""
+msgstr "Úložiště"
 
 #: tformstorage.listview1.columns[0].caption
 msgctxt "tformstorage.listview1.columns[0].caption"
 msgid "Address"
-msgstr ""
+msgstr "Adresa"
 
 #: tformstorage.listview1.columns[1].caption
 msgctxt "tformstorage.listview1.columns[1].caption"
 msgid "Data"
-msgstr ""
-
+msgstr "Data"
+
+#: tformstorage.listview1.columns[2].caption
+msgctxt "tformstorage.listview1.columns[2].caption"
+msgid "ASCII"
+msgstr "ASCII"

branches/ByteArray/Languages/ByteArray.pot

@@ -125 +125 @@
 
 #: tformmemory.listviewmemory.columns[2].caption
+msgctxt "tformmemory.listviewmemory.columns[2].caption"
 msgid "ASCII"
 msgstr ""
@@ -220 +221 @@
 msgstr ""
 
+#: tformstorage.listview1.columns[2].caption
+msgctxt "tformstorage.listview1.columns[2].caption"
+msgid "ASCII"
+msgstr ""
+

@@ -6 +6 @@
 ByteArray.res
 ByteArray.dbg
+Storage.dat