Merge pull request #3 from below/main

Merge pull request below#42 from skrrb/fix-entrypoint
fengjixuchui · Jan 10, 2023 · cf34909 · cf34909
2 parents cdf79bb + 9fc970d
commit cf34909
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Chapter 01/HelloWorld.s b/Chapter 01/HelloWorld.s
@@ -6,12 +6,12 @@
 // X16 - Mach System Call function number
 //
 
-.global start			// Provide program starting address to linker
+.global _start			// Provide program starting address to linker
 .align 2			// Make sure everything is aligned properly
 
 // Setup the parameters to print hello world
 // and then call the Kernel to do it.
-start: mov	X0, #1		// 1 = StdOut
+_start: mov	X0, #1		// 1 = StdOut
 	adr	X1, helloworld 	// string to print
 	mov	X2, #13	    	// length of our string
 	mov	X16, #4		// Unix write system call

diff --git a/README.md b/README.md
@@ -168,7 +168,7 @@ As [Chapter 10](https://github.com/below/HelloSilicon#chapter-10) focusses on bu
 
 Be aware that the function numbers are not only different, but on Darwin, they are considered private and subject to change.
 
-## Chapter 4: Controlling Programm Flow
+## Chapter 4: Controlling Program Flow
 
 Besides the common changes, we face a new issue which is described in the book in Chapter 5: Darwin does not like `LDR X1, =symbol`, it will produce the error `ld: Absolute addressing not allowed in arm64 code`. If we use `ASR X1, symbol`, as suggested in Chapter 3 of the book, our data has to be in the read-only `.text` section. In this sample however, we want writable data.