Changeset 47 for branches/ByteArray/Devices/Memory.pas

Timestamp:

Oct 25, 2023, 12:33:07 AM (7 months ago)

Author:

chronos

Message:

• Added: Common package.
• Modified: Improved BigInt class.

File:

• branches/ByteArray/Devices/Memory.pas (modified) (5 diffs)

branches/ByteArray/Devices/Memory.pas

@@ -17 +17 @@
   public
     Position: Integer;
-    function Read(Address: TBigInt; Size: Byte): TBigInt;
-    function ReadPos(Size: Byte): TBigInt;
-    procedure Write(Address: TBigInt; Size: Byte; Value: TBigInt);
-    procedure WritePos(Size: Byte; Value: TBigInt);
+    function Read(Address: TBigInt; ASize: TBigIntSize): TBigInt;
+    function ReadPos(ASize: Byte): TBigInt;
+    procedure Write(Address: TBigInt; ASize: TBigIntSize; Value: TBigInt);
+    procedure WritePos(ASize: Byte; Value: TBigInt);
     procedure WriteStringPos(Value: string);
     function GetAddressCount: Integer; override;
@@ -30 +30 @@
 
 implementation
+
+resourcestring
+  SOutOfRange = 'Out of range';
 
 { TMemory }
@@ -43 +46 @@
 end;
 
-function TMemory.Read(Address: TBigInt; Size: Byte): TBigInt;
+function TMemory.Read(Address: TBigInt; ASize: TBigIntSize): TBigInt;
 begin
-  case Size of
+  if Address + ASize >= Size then raise Exception.Create(SOutOfRange);
+  case ASize of
     1: Result := PByte(FData + Integer(Address))^;
     2: Result := PWord(FData + Integer(Address))^;
@@ -53 +57 @@
 end;
 
-function TMemory.ReadPos(Size: Byte): TBigInt;
+function TMemory.ReadPos(ASize: Byte): TBigInt;
 begin
-  Result := Read(Position, Size);
+  Result := Read(Position, ASize);
 end;
 
-procedure TMemory.Write(Address: TBigInt; Size: Byte; Value: TBigInt);
+procedure TMemory.Write(Address: TBigInt; ASize: TBigIntSize; Value: TBigInt);
 begin
-  case Size of
+  if Address + ASize >= Size then raise Exception.Create(SOutOfRange);
+  case ASize of
     1: PByte(FData + Integer(Address))^ := Value;
     2: PWord(FData + Integer(Address))^ := Value;
@@ -68 +73 @@
 end;
 
-procedure TMemory.WritePos(Size: Byte; Value: TBigInt);
+procedure TMemory.WritePos(ASize: Byte; Value: TBigInt);
 begin
-  Write(Position, Size, Value);
+  Write(Position, ASize, Value);
 end;