reserve /^ [^ ;]/ for statements inserted for debugging purposes

[trains.git] / layout / data2safety

diff --git a/layout/data2safety b/layout/data2safety
index 26b6021ab216ba58f9b223bc4a0839de3a9b5cea..ce477e9202868114fb2ca2fbb04402572598a5ad 100755 (executable)
--- a/layout/data2safety
+++ b/layout/data2safety
@@ -474,7 +474,7 @@ sub writeout () {
 sub o_section ($$) {
     my ($sec,$docstring) = @_;
     o("\n;----------\n".
-      " org $sec\n");
+      "  org $sec\n");
     o($docstring);
 }
 sub o_section_end_fill ($$$) {
@@ -485,14 +485,14 @@ sub o_section_end_fill ($$$) {
     } else {
        o("\n");
     }
-    o(sprintf " fill %s, %d*(maxpics-%d)\n\n",
+    o(sprintf "  fill %s, %d*(maxpics-%d)\n\n",
       $fillvalue, $entrysize, $lastnumdone);
 }
 
 sub o_db ($;$) {
     my ($ix,$every) = @_;
     $every=16 unless defined $every;
-    o(($every ? $ix % $every : $ix) ? ',' : "\n db ");
+    o(($every ? $ix % $every : $ix) ? ',' : "\n  db ");
 }
 
 sub writeasm_sense {
@@ -512,9 +512,9 @@ END
       "Detectors equ 0x80\n".
       "Reversers equ 0x00\n\n");
     for ($num=0; $num<@boardtype; $num++) {
-       if (!defined $boardtype[$num]) { o(" dw  0\t\t\t\t; $num\n"); next; }
+       if (!defined $boardtype[$num]) { o("  dw  0\t\t\t\t; $num\n"); next; }
        $base= $sensesbase[$num];
-       o(sprintf " db  SenseExists | 0x%02x, %12s | 0x%02x\t; %d\n",
+       o(sprintf "  db  SenseExists | 0x%02x, %12s | 0x%02x\t; %d\n",
          $base >> 7, ucfirst($boardtype[$num]), $base & 0x7f, $num);
     }
     o_section_end_fill($num, 0, 2);
@@ -530,7 +530,7 @@ sub writeasm_pt {
 ; or boards with no points are all-bits-0.
 END
     for ($num=0; $num<@boardtype; $num++) {
-       if (!defined $boardtype[$num]) { o(" dw  0\t\t\t\t; $num"); next; }
+       if (!defined $boardtype[$num]) { o("  dw  0\t\t\t\t; $num"); next; }
        die if $maxptixln2 < 4; # must be whole no. of 16-bit words
        $elemsize= 1 << ($maxptixln2-3);
        for ($byte=0; $byte < $elemsize; $byte++) {
@@ -557,7 +557,7 @@ END
 ;   Index:  00Dppppp    where D is 1 iff detectors board and p is pt ix
 ;   Value:  0ppp0bbb    where p is port num and b is bit num; or 0xff
 END
-    o(" radix hex\n");
+    o("  radix hex\n");
     for ($typeix=0; $typeix<2; $typeix++) {
        $type= qw(reversers detectors)[$typeix];
        die $type unless $pin_info{$type};
@@ -574,7 +574,7 @@ END
        }
        o("\n");
     }
-    o(" radix dec\n\n");
+    o("  radix dec\n\n");
 }
 
 sub writeasm_reverse {
@@ -594,7 +594,7 @@ END
            $pu->[1] =~ m/^([04])\,\d,(0x\w{2})$/ or die;
            push @{ $portae[!!$1] }, $2;
        }
-       o(' db ');
+       o('  db ');
        o(join(', ', map { @$_ ? join('|',@$_) : '0' } @portae));
        o(sprintf " ; %d\n",$num);
     }
@@ -606,14 +606,14 @@ sub writeasm () {
     close STDOUT or die $!;
     open STDOUT, ">$basename+pindata.asm" or die $!;
     o("; autogenerated - do not edit\n");
-    o("        include pindata.inc\n".
-      "        radix dec\n".
+    o("  include pindata.inc\n".
+      "  radix dec\n".
       "ff equ 0xff\n");
     $each= 10;
     for $k (@objkinds) {
        &{"writeasm_$k"}();
     }
-    o("\n        end\n");
+    o("\n  end\n");
 }
 mainread();
 writeout();