+ write the omf header in the omf binary writer

git-svn-id: trunk@30395 -

compiler/ogomf.pas

@@ -85,7 +85,18 @@ implementation
 ****************************************************************************}
 
     function TOmfObjOutput.writeData(Data:TObjData):boolean;
+      var
+        RawRecord: TOmfRawRecord;
+        Header: TOmfRecord_THEADR;
       begin
+        { write header record }
+        RawRecord:=TOmfRawRecord.Create;
+        Header:=TOmfRecord_THEADR.Create;
+        Header.ModuleName:=Data.Name;
+        Header.EncodeTo(RawRecord);
+        RawRecord.WriteTo(FWriter);
+        Header.Free;
+        RawRecord.Free;
         result:=true;
       end;
 

compiler/omfbase.pas

@@ -25,7 +25,7 @@ unit omfbase;
 {$i fpcdefs.inc}
 
 interface
-
+{$H+}
   uses
     owbase;
 
@@ -88,6 +88,9 @@ interface
       property RecordType: Byte read GetRecordType write SetRecordType;
       property RecordLength: Word read GetRecordLength write SetRecordLength;
 
+      function ReadStringAt(Offset: Integer; out s: string): Integer;
+      function WriteStringAt(Offset: Integer; s: string): Integer;
+
       procedure CalculateChecksumByte;
       function VerifyChecksumByte: boolean;
       property ChecksumByte: Byte read GetChecksumByte write SetChecksumByte;
@@ -96,8 +99,31 @@ interface
       procedure WriteTo(aWriter: TObjectWriter);
     end;
 
+    { TOmfParsedRecord }
+
+    TOmfParsedRecord = class
+    public
+      procedure DecodeFrom(RawRecord: TOmfRawRecord);virtual;abstract;
+      procedure EncodeTo(RawRecord: TOmfRawRecord);virtual;abstract;
+    end;
+
+    { TOmfRecord_THEADR }
+
+    TOmfRecord_THEADR = class(TOmfParsedRecord)
+    private
+      FModuleName: string;
+    public
+      procedure DecodeFrom(RawRecord: TOmfRawRecord);override;
+      procedure EncodeTo(RawRecord: TOmfRawRecord);override;
+
+      property ModuleName: string read FModuleName write FModuleName;
+    end;
+
 implementation
 
+  uses
+    verbose;
+
   { TOmfRawRecord }
 
   function TOmfRawRecord.GetRecordType: Byte;
@@ -121,6 +147,30 @@ implementation
       RawData[-1]:=Byte(AValue shr 8);
     end;
 
+  function TOmfRawRecord.ReadStringAt(Offset: Integer; out s: string): Integer;
+    var
+      len: Byte;
+    begin
+      len:=RawData[Offset];
+      Result:=Offset+len+1;
+      if result>RecordLength then
+        internalerror(2015033103);
+      SetLength(s, len);
+      UniqueString(s);
+      Move(RawData[Offset+1],s[1],len);
+    end;
+
+  function TOmfRawRecord.WriteStringAt(Offset: Integer; s: string): Integer;
+    begin
+      if Length(s)>255 then
+        internalerror(2015033101);
+      result:=Offset+Length(s)+1;
+      if result>High(RawData) then
+        internalerror(2015033102);
+      RawData[Offset]:=Length(s);
+      Move(s[1], RawData[Offset+1], Length(s));
+    end;
+
   function TOmfRawRecord.GetChecksumByte: Byte;
     begin
       if RecordLength>0 then
@@ -172,4 +222,21 @@ implementation
       aWriter.write(RawData, RecordLength+3);
     end;
 
+  { TOmfRecord_THEADR }
+
+  procedure TOmfRecord_THEADR.DecodeFrom(RawRecord: TOmfRawRecord);
+    begin
+      RawRecord.ReadStringAt(0,FModuleName);
+    end;
+
+  procedure TOmfRecord_THEADR.EncodeTo(RawRecord: TOmfRawRecord);
+    var
+      NextOfs: Integer;
+    begin
+      RawRecord.RecordType:=RT_THEADR;
+      NextOfs:=RawRecord.WriteStringAt(0,ModuleName);
+      RawRecord.RecordLength:=NextOfs+1;
+      RawRecord.CalculateChecksumByte;
+    end;
+
 end.