Changeset 490

Timestamp:

Jun 22, 2010, 1:27:23 AM (15 years ago)

Author:

David Azarewicz

Message:

Fixed missing symbols, sorted output, etc.

File:

• OCO/trunk/tools/wat2map.cmd (modified) (3 diffs)

OCO/trunk/tools/wat2map.cmd

@@ -136 +136 @@
 /* call lineout outfile ,' '*/
 
+LineTbl.0=0;
+LineIX = 0;
 Do While Lines( mapFile ) <> 0
    watcomText = LineIn( mapFile )
    Parse Value watcomText With seg ':' ofs declaration
+   if length(ofs) = 5 then
+     ofs = left(ofs, 4) || strip(translate(right(ofs, 1),, '+*'))
    if length(ofs) = 9 then
      ofs = left(ofs, 8) || strip(translate(right(ofs, 1),, '+*'))
@@ -155 +159 @@
 
       /*--- Strip array brackets if this is an array. */
-      sqBracket = Pos( '[', declaration )
+      sqBracket = Pos( '[', declaration );
       If sqBracket <> 0
          Then declaration = Substr(declaration, 1, sqBracket-1);
@@ -161 +165 @@
       /*--- Strip leading tokens from the function name.
          Eg., remove function return type, near/far, etc.  */
-      declaration = Word( declaration, Words(declaration) )
+      declaration = Word( declaration, Words(declaration) );
 
       /*--- Strip any remaining parens around function name. ---*/
-      declaration = ReplaceSubstr( '(', ' ', declaration )
-      declaration = ReplaceSubstr( ')', ' ', declaration )
+      declaration = ReplaceSubstr( '(', ' ', declaration );
+      declaration = ReplaceSubstr( ')', ' ', declaration );
 
       /*--- Debug kernel doesn't like symbol for scoping operator "::"
          in symbol names.  Replace :: with double underscore "__". ---*/
-      declaration = ReplaceSubstr( '::', '__', declaration )
+      declaration = ReplaceSubstr( '::', '__', declaration );
 
       /*--- Debug kernel doesn't like symbol for destructor "~"
          in symbol names.  Replace ~ with character "d" for "destructor.
          Note destructor for a class will translate "A::~A" -> "A__dA". ---*/
-      declaration = ReplaceSubstr( '~', 'd', declaration )
+      declaration = ReplaceSubstr( '~', 'd', declaration );
+
+      /* remove any trailing underscore */
+      declaration = STRIP(declaration, 't', '_');
+
+      /* remove the first underscore (if any) */
+      if (LEFT(declaration,1) = '_') then do;
+        declaration = RIGHT(declaration, LENGTH(declaration)-1);
+      end;
 
       fill = copies(' ', 7)
-      call lineout outfile ,' ' || seg || ':' || ofs || fill || declaration
+      LineIX = LineIX + 1;
+      LineTbl.LineIX = seg || ':' || ofs || fill || declaration;
+      LineTbl.0 = LineIX;
    End;
 End; /* End While through symbol section, end of input file. */
+
+
+/* Sort the data */
+do i=2 to LineTbl.0
+   t=LineTbl.i
+   do j=i-1 to 1 by -1 while t<LineTbl.j
+      k=j+1
+      LineTbl.k=LineTbl.j
+   end
+   j=j+1
+   LineTbl.j=t
+end
+
+/* output the data */
+do LineIX = 1 to LineTbl.0;
+  call lineout outfile , ' ' || LineTbl.LineIX;
+end;
 
 call stream mapfile, 'C', 'CLOSE'