aaru-dps/Aaru
1
0
Fork 0
mirror of https://github.com/aaru-dps/Aaru.git synced 2025-12-16 19:24:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

[AmigaDOS] Use new source generator based big endian marshaller

Browse Source
This commit is contained in:
Natalia Portillo
2025-10-21 02:17:58 +01:00
parent 070c55af4f
commit b7621c2f90
3 changed files with 37 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Aaru.Filesystems/AmigaDOS/Helpers.cs
View File

@@ -40,7 +40,7 @@ public sealed partial class AmigaDOSPlugin
var tmp = new byte[228];
Array.Copy(block, 0, tmp, 0, 24);
Array.Copy(block, block.Length - 200, tmp, 28, 200);
RootBlock root = Marshal.ByteArrayToStructureBigEndian<RootBlock>(tmp);
RootBlock root = Marshal.ByteArrayToStructureBigEndianGenerated<RootBlock>(tmp);
root.hashTable = new uint[(block.Length - 224) / 4];
for(var i = 0; i < root.hashTable.Length; i++)

12
Aaru.Filesystems/AmigaDOS/Info.cs
View File

@@ -60,7 +60,7 @@ public sealed partial class AmigaDOSPlugin
if(errno != ErrorNumber.NoError) return false;
BootBlock bblk = Marshal.ByteArrayToStructureBigEndian<BootBlock>(sector);
BootBlock bblk = Marshal.ByteArrayToStructureBigEndianGenerated<BootBlock>(sector);
// AROS boot floppies...
if(sector.Length >= 512 &&
@@ -73,7 +73,7 @@ public sealed partial class AmigaDOSPlugin
if(errno != ErrorNumber.NoError) return false;
bblk = Marshal.ByteArrayToStructureBigEndian<BootBlock>(sector);
bblk = Marshal.ByteArrayToStructureBigEndianGenerated<BootBlock>(sector);
}
// Not FFS or MuFS?
@@ -124,7 +124,7 @@ public sealed partial class AmigaDOSPlugin
AaruLogging.Debug(MODULE_NAME, "rblk.hashTableSize = {0}", rblk.hashTableSize);
uint blockSize = (rblk.hashTableSize + 56) * 4;
uint sectorsPerBlock = (uint)(blockSize / sector.Length);
var sectorsPerBlock = (uint)(blockSize / sector.Length);
AaruLogging.Debug(MODULE_NAME, "blockSize = {0}", blockSize);
AaruLogging.Debug(MODULE_NAME, "sectorsPerBlock = {0}", sectorsPerBlock);
@@ -166,7 +166,7 @@ public sealed partial class AmigaDOSPlugin
if(errno != ErrorNumber.NoError) return;
BootBlock bootBlk = Marshal.ByteArrayToStructureBigEndian<BootBlock>(bootBlockSectors);
BootBlock bootBlk = Marshal.ByteArrayToStructureBigEndianGenerated<BootBlock>(bootBlockSectors);
bootBlk.bootCode = new byte[bootBlockSectors.Length - 12];
Array.Copy(bootBlockSectors, 12, bootBlk.bootCode, 0, bootBlk.bootCode.Length);
bootBlockSectors[4] = bootBlockSectors[5] = bootBlockSectors[6] = bootBlockSectors[7] = 0;
@@ -192,7 +192,7 @@ public sealed partial class AmigaDOSPlugin
var rootBlk = new RootBlock();
byte[] rootBlockSector = null;
bool rootFound = false;
var rootFound = false;
uint blockSize = 0;
// So to handle even number of sectors
@@ -214,7 +214,7 @@ public sealed partial class AmigaDOSPlugin
AaruLogging.Debug(MODULE_NAME, "rootBlk.hashTableSize = {0}", rootBlk.hashTableSize);
blockSize = (rootBlk.hashTableSize + 56) * 4;
uint sectorsPerBlock = (uint)(blockSize / rootBlockSector.Length);
var sectorsPerBlock = (uint)(blockSize / rootBlockSector.Length);
AaruLogging.Debug(MODULE_NAME, "blockSize = {0}", blockSize);
AaruLogging.Debug(MODULE_NAME, "sectorsPerBlock = {0}", sectorsPerBlock);

57
Aaru.Filesystems/AmigaDOS/Structs.cs
View File

@@ -27,6 +27,7 @@
// ****************************************************************************/
using System.Runtime.InteropServices;
using Aaru.CommonTypes.Attributes;
namespace Aaru.Filesystems;
@@ -38,14 +39,15 @@ public sealed partial class AmigaDOSPlugin
/// <summary>Boot block, first 2 sectors</summary>
[StructLayout(LayoutKind.Sequential, Pack = 1)]
struct BootBlock
[SwapEndian]
partial struct BootBlock
{
/// <summary>Offset 0x00, "DOSx" disk type</summary>
public readonly uint diskType;
public uint diskType;
/// <summary>Offset 0x04, Checksum</summary>
public readonly uint checksum;
public uint checksum;
/// <summary>Offset 0x08, Pointer to root block, mostly invalid</summary>
public readonly uint root_ptr;
public uint root_ptr;
/// <summary>Offset 0x0C, Boot code, til completion. Size is intentionally incorrect to allow marshaling to work.</summary>
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 1)]
public byte[] bootCode;
@@ -56,18 +58,19 @@ public sealed partial class AmigaDOSPlugin
#region Nested type: RootBlock
[StructLayout(LayoutKind.Sequential, Pack = 1)]
struct RootBlock
[SwapEndian]
partial struct RootBlock
{
/// <summary>Offset 0x00, block type, value = T_HEADER (2)</summary>
public uint type;
/// <summary>Offset 0x04, unused</summary>
public readonly uint headerKey;
public uint headerKey;
/// <summary>Offset 0x08, unused</summary>
public readonly uint highSeq;
public uint highSeq;
/// <summary>Offset 0x0C, longs used by hash table</summary>
public uint hashTableSize;
/// <summary>Offset 0x10, unused</summary>
public readonly uint firstData;
public uint firstData;
/// <summary>Offset 0x14, Rootblock checksum</summary>
public uint checksum;
/// <summary>
@@ -77,45 +80,45 @@ public sealed partial class AmigaDOSPlugin
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 1)]
public uint[] hashTable;
/// <summary>Offset 0x18+hashTableSize*4+0, bitmap flag, 0xFFFFFFFF if valid</summary>
public readonly uint bitmapFlag;
public uint bitmapFlag;
/// <summary>Offset 0x18+hashTableSize*4+4, bitmap pages, 25 entries</summary>
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 25)]
public readonly uint[] bitmapPages;
public uint[] bitmapPages;
/// <summary>Offset 0x18+hashTableSize*4+104, pointer to bitmap extension block</summary>
public readonly uint bitmapExtensionBlock;
public uint bitmapExtensionBlock;
/// <summary>Offset 0x18+hashTableSize*4+108, last root alteration days since 1978/01/01</summary>
public readonly uint rDays;
public uint rDays;
/// <summary>Offset 0x18+hashTableSize*4+112, last root alteration minutes past midnight</summary>
public readonly uint rMins;
public uint rMins;
/// <summary>Offset 0x18+hashTableSize*4+116, last root alteration ticks (1/50 secs)</summary>
public readonly uint rTicks;
public uint rTicks;
/// <summary>Offset 0x18+hashTableSize*4+120, disk name, pascal string, 31 bytes</summary>
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 31)]
public readonly byte[] diskName;
public byte[] diskName;
/// <summary>Offset 0x18+hashTableSize*4+151, unused</summary>
public readonly byte padding;
public byte padding;
/// <summary>Offset 0x18+hashTableSize*4+152, unused</summary>
public readonly uint reserved1;
public uint reserved1;
/// <summary>Offset 0x18+hashTableSize*4+156, unused</summary>
public readonly uint reserved2;
public uint reserved2;
/// <summary>Offset 0x18+hashTableSize*4+160, last disk alteration days since 1978/01/01</summary>
public readonly uint vDays;
public uint vDays;
/// <summary>Offset 0x18+hashTableSize*4+164, last disk alteration minutes past midnight</summary>
public readonly uint vMins;
public uint vMins;
/// <summary>Offset 0x18+hashTableSize*4+168, last disk alteration ticks (1/50 secs)</summary>
public readonly uint vTicks;
public uint vTicks;
/// <summary>Offset 0x18+hashTableSize*4+172, filesystem creation days since 1978/01/01</summary>
public readonly uint cDays;
public uint cDays;
/// <summary>Offset 0x18+hashTableSize*4+176, filesystem creation minutes since 1978/01/01</summary>
public readonly uint cMins;
public uint cMins;
/// <summary>Offset 0x18+hashTableSize*4+180, filesystem creation ticks since 1978/01/01</summary>
public readonly uint cTicks;
public uint cTicks;
/// <summary>Offset 0x18+hashTableSize*4+184, unused</summary>
public readonly uint nextHash;
public uint nextHash;
/// <summary>Offset 0x18+hashTableSize*4+188, unused</summary>
public readonly uint parentDir;
public uint parentDir;
/// <summary>Offset 0x18+hashTableSize*4+192, first directory cache block</summary>
public readonly uint extension;
public uint extension;
/// <summary>Offset 0x18+hashTableSize*4+196, block secondary type = ST_ROOT (1)</summary>
public uint sec_type;
}