From: Ben Pfaff Date: Sun, 29 Aug 2004 07:08:21 +0000 (+0000) Subject: Adjust indentation for .globl directives. X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=637d20eadbc4cb26b67335c282b34e20a2738fb6;p=pintos-anon Adjust indentation for .globl directives. --- diff --git a/src/threads/intr-stubs.pl b/src/threads/intr-stubs.pl index 9725860..6ac5a8d 100755 --- a/src/threads/intr-stubs.pl +++ b/src/threads/intr-stubs.pl @@ -4,7 +4,7 @@ print <<'EOF'; #include "mmu.h" .data - .globl intr_stubs +.globl intr_stubs intr_stubs: EOF @@ -20,7 +20,7 @@ EOF for $i (0...255) { $x = sprintf ("%02x", $i); - print "\t.globl intr${x}_stub\n"; + print ".globl intr${x}_stub\n"; print "intr${x}_stub:\n"; print "\tpushl \$0\n" if ($i != 8 && $i != 10 && $i != 11 @@ -45,13 +45,12 @@ intr_entry: # Call handler. pushl %esp - .globl intr_handler +.globl intr_handler call intr_handler addl $4, %esp - .globl intr_exit +.globl intr_exit intr_exit: - # Restore caller's registers. popal popl %es diff --git a/src/threads/start.S b/src/threads/start.S index 351b5e1..5862479 100644 --- a/src/threads/start.S +++ b/src/threads/start.S @@ -2,7 +2,7 @@ # is the very beginning of its binary image. All we need to do is # jump to the real entry point. - .globl start +.globl start start: call main # If main returns, spin. diff --git a/src/threads/switch.S b/src/threads/switch.S index fddd821..c077e46 100644 --- a/src/threads/switch.S +++ b/src/threads/switch.S @@ -1,6 +1,6 @@ #include "switch.h" - .globl switch_threads +.globl switch_threads switch_threads: # Save caller's register state. # Note that the SVR4 ABI allows us to destroy %eax, %ecx, %edx. @@ -11,7 +11,7 @@ switch_threads: pushl %edi # Get offsetof (struct thread, stack). - .globl thread_stack_ofs +.globl thread_stack_ofs mov thread_stack_ofs, %edx # Save current stack pointer to old thread's stack, if any. @@ -32,14 +32,14 @@ switch_threads: popl %ebx ret - .globl switch_entry +.globl switch_entry switch_entry: # Discard thread_switch() arguments. addl $8, %esp # Call schedule_tail(prev). pushl %eax - .globl schedule_tail +.globl schedule_tail call schedule_tail addl $4, %esp