[12/20] Factorize code for handling local labels
diff mbox

Message ID 1395664691-60544-12-git-send-email-martin@martin.st
State Committed
Headers show

Commit Message

Martin Storsjö March 24, 2014, 12:38 p.m. 
---
 gas-preprocessor.pl | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

Comments

Janne Grunau March 24, 2014, 3:56 p.m. | #1 
On 2014-03-24 14:38:03 +0200, Martin Storsjö wrote:
> ---
>  gas-preprocessor.pl | 27 +++++++++++++++++----------
>  1 file changed, 17 insertions(+), 10 deletions(-)

ok

Janne

Patch
diff mbox 

diff --git a/gas-preprocessor.pl b/gas-preprocessor.pl
index 3bdc7dd..f59d245 100755
--- a/gas-preprocessor.pl
+++ b/gas-preprocessor.pl
@@ -615,6 +615,22 @@  sub is_register {
     return 0;
 }
 
+sub handle_local_label {
+    my $line = $_[0];
+    my $num  = $_[1];
+    my $dir  = $_[2];
+    my $target = "$num$dir";
+    if ($dir eq "b") {
+        $line =~ s/$target/$last_temp_labels{$num}/;
+    } else {
+        my $name = "temp_label_$temp_label_next";
+        $temp_label_next++;
+        push(@{$next_temp_labels{$num}}, $name);
+        $line =~ s/$target/$name/;
+    }
+    return $line;
+}
+
 # pass 2
 foreach my $line (@pass1_lines) {
     # handle .previous (only with regard to .section not .subsection)
@@ -836,16 +852,7 @@  foreach my $line (@pass1_lines) {
                 # Not actually a branch
             } elsif ($target =~ /(\d+)([bf])/) {
                 # The target is a local label
-                my $num = $1;
-                my $dir = $2;
-                if ($dir eq "b") {
-                    $line =~ s/$target/$last_temp_labels{$num}/;
-                } else {
-                    my $name = "temp_label_$temp_label_next";
-                    $temp_label_next++;
-                    push(@{$next_temp_labels{$num}}, $name);
-                    $line =~ s/$target/$name/;
-                }
+                $line = handle_local_label($line, $1, $2);
             } elsif (!is_register($target)) {
                 $call_targets{$target}++;
             }