Changeset 293 for GPL/trunk/tools

Timestamp:

Feb 17, 2008, 8:39:48 PM (17 years ago)

Author:

Brendan Oakley

Message:

Wat2map fixes from tickets #80 and #58

File:

• GPL/trunk/tools/wat2map.cmd (modified) (10 diffs)

GPL/trunk/tools/wat2map.cmd

@@ -1 @@
-/* $Id: wat2map.cmd,v 1.1.1.1 2003/07/02 13:57:04 eleph Exp $ */
+/*
+ * Includes fixes from Helper script MapSym.cmd by Knut (aka bird).
+ *
+ * Copyright (c) 2002 knut st. osmundsen (bird@anduin.net)
+ *
+ * Project Odin Software License can be found in LICENSE.TXT
+ *
+ */
 
 /* SCCSID = %W% %E% */
@@ -47 +54 @@
 /* <End of helpText> - don't modify this string - used to flag end of help. */
 /****************************************************************************/
-CALL RXFUNCADD 'sysloadfuncs','rexxutil','sysloadfuncs'
-call sysloadfuncs
-
-Parse Arg arg1 arg2 rest
+
+Parse arg arg1 arg2
+
 If (Length( arg1 ) = 0) | (Verify( arg1, '/-?' ) = 0) Then Do;
    Do i = 1 to 1000
@@ -57 +63 @@
       Say helpText
    End;
-   Return
+   Return 1
 End;
-If Length( arg2 ) = 0 Then Do;
+
+If Length( arg2 ) == 0 Then Do;
    Say " Way to go Beaver... How about an out-put file name ?"
-   Return
+   Return 2
 End;
 mapFile = arg1          /* Can be Null, in which case we pull from stdin. */
 outFile = arg2
+fFlatMode = 0;
 
 /* erase outfile */  /* kill the old map file */
@@ -73 +81 @@
 Do While Lines( mapFile ) <> 0
    watcomText = LineIn( mapFile )
-   Parse Value watcomText With "Executable Image: " fileName "." fileExt
-
-   If fileName <> "" Then Do;   /* Found match */
-      call lineout outfile ,' '
-      call lineout outfile ,' ' || fileName
-      call lineout outfile ,' '
-      Leave;                    /* Break from loop. */
+   /*Parse Value watcomText With "Executable Image: " fileName "." fileExt*/
+   Parse Value watcomText With "Executable Image: " sFilename
+   If (sFilename <> '') Then Do;
+      sFilename = filespec('name', sFilename);
+      Parse Var sFilename fileName "." fileExt
+      If fileName <> "" Then Do;   /* Found match */
+         call lineout outfile ,' '
+         call lineout outfile ,' ' || fileName
+         call lineout outfile ,' '
+         Leave;                    /* Break from loop. */
+      End;
    End;
 End
 If Lines( mapFile ) = 0 Then Do;        /* If end of file ... */
    Say "Error:  Expected to find line with text 'Executable Image:' "
-   Return
+   Return 3
 End
 
@@ -97 +109 @@
 If Lines( mapFile ) = 0 Then Do;        /* If end of file ... */
    Say "Error:  Expected to find line with text 'Segments ... Size' "
-   Return
-End
-junk = LineIn( mapFile )       /* Discard a couple lines of formatting. */
-junk = LineIn( mapFile )
-
+   Return 4
+End
+
+
+junk = LineIn( mapFile )      /* Discard a couple lines of formatting. */
+junk = LineIn( mapFile )      /* Discard a couple lines of formatting. */
 /*--- 4.  Translate segment table.  ---*/
-call lineout outfile , " Start     Length     Name                   Class"
-Do While Lines( mapFile ) <> 0
-   watcomText = LineIn( mapFile )
-   Parse Value watcomText With segName className groupName address size .
+/*"Segment                Class          Group          Address         Size"*/
+iClass = pos('Class', watcomText);
+iGroup = pos('Group', watcomText);
+iAddress = pos('Address', watcomText);
+iSize = pos('Size', watcomText);
+
+call lineout outfile , " Start         Length     Name                   Class"  /* bird bird bird fixed!!! */
+Do While Lines( mapFile ) <> 0
+   watcomText = LineIn( mapFile )
+   /* do it the hard way to make sure we support spaces segment names. */
+   segName = strip(substr(watcomText, 1, iClass-1));
    If segName = "" Then Leave;          /* Empty line, break from loop. */
-   length = Substr( size, 4, 5 ) || 'H     '
+   className = strip(substr(watcomText, iClass, iGroup-iClass));
+   groupName = strip(substr(watcomText, iGroup, iAddress-iGroup));
+   address = strip(substr(watcomText, iAddress, iSize-iAddress));
+   size = strip(substr(watcomText, iSize));
+   if (pos(':', address) <= 0) then     /* NT binaries doesn't have a segment number. */
+   do
+      fFlatMode = 1;
+      address = '0001:'||address;
+   end
+   length = right(strip(strip(size), 'L', '0'), 9, '0') || 'H     '
    segName = Left( segName, 23 )
    call lineout outfile ,' ' || address || ' ' || length || segName || className
@@ -124 +153 @@
 Do While Lines( mapFile ) <> 0
    watcomText = LineIn( mapFile )
-   Parse Value watcomText With seg ':' ofs 10 . 16 declaration
+   Parse Value watcomText With seg ':' ofs 14 . 16 declaration
+   if (fFlatMode) then
+   do
+      seg = '0001';
+      Parse Value watcomText With ofs 9 . 16 declaration
+   end
+   else
+   do  /* kso: more workarounds */
+       if (is_Hex(seg) & length(ofs) > 4 & \is_Hex(substr(ofs,5,1))) then
+           ofs = '0000'||left(ofs,4);
+   end
+   /*say ofs  '-'declaration*/
    is_Adress = (is_Hex(seg) = 1) & (is_Hex(ofs) = 1)
-   If (is_Adress = 1) Then Do;
-
+   If ((is_Adress = 1) & (seg <> '0000')) Then Do;          /* bird: skip symbols with segment 0. (__DOSseg__) */
       /*--- Haven't done the work to xlate operator symbols - skip the line. */
       If Pos( '::operator', declaration ) <> 0 Then Iterate;
@@ -158 +197 @@
       call lineout outfile ,' ' || seg || ':' || ofs || '       ' || declaration
    End;
+
+   /* check for entry point, if found we add it and quit. */
+   if (pos('Entry point address', watcomText) > 0) then
+   do
+       parse var watcomText 'Entry point address:' sEntryPoint
+       if (pos(':', sEntryPoint) <= 0) then
+           sEntryPoint = '0001:'||strip(sEntryPoint);
+       call lineout outfile, ''
+       call lineout outfile, 'Program entry point at' strip(sEntryPoint)
+       leave;
+   end
 End; /* End While through symbol section, end of input file. */
 
-Return;  /* End of program.  */
+call stream outfile, 'c', 'close';
+call stream mapfile, 'c', 'close';
+
+Return 0;  /* End of program.  */
 
 /*--- Helper subroutines. ---*/
@@ -184 +237 @@
       Return StripMatchedParen( string )
    End;
-End;
+return;
 
 ReplaceSubstr:
@@ -198 +251 @@
    End;
    Return string
-End;
+return;
 
 is_Hex:
@@ -204 +257 @@
    Parse Arg string
    Return (Length(string) > 0) &  (Verify( string, '0123456789abcdefABCDEF' ) = 0)
-End;
+return;