Corrected the memory load commands for Chapter 5

Author: below

Chapter 5/codesnippets.s

@@ -33,19 +33,22 @@ l5:	.byte		0x3F
 .text
 
 _start: 
-l6:	ADRP	X1, helloworld@GOTPAGE
+l6:	ADRP	X1, helloworld@PAGE
+	ADD	X1, X1, helloworld@PAGEOFF
 	ADR	X1, helloworld2
 
 l7:	LDR	X1, =0x1234ABCD1234ABCD
 
 l8:
 // load the address of mynumber into X1
-	ADRP	X1, mynumber@GOTPAGE
+	ADRP	X1, mynumber@PAGE
+	ADD	X1, X1, mynumber@PAGEOFF
 // load the word stored at mynumber into X2
 	LDR	X2, [X1]
 
 
-l9:	ADRP	X1, arr1@GOTPAGE
+l9:	ADRP	X1, arr1@PAGE
+	ADD	X1, X1, arr1@PAGEOFF
 
 l10:	// Load the first element
 	LDR	W2, [X1]
@@ -74,12 +77,14 @@ l13: 	// Our array is of WORDs. 2 is the index
 
 l14:	LDR W2, [X1, #(2 * 4)]!
 
-	ADRP X2, arr1@GOTPAGE
+	ADRP X2, arr1@PAGE
+	ADD  X2, X2, arr1@PAGEOFF
 l15:	// Load X1 with the memory pointed to by X2
 	// Then do X2 = X2 + 2
 	LDR	X1, [X2], #2
 
-l16: 	ADRP	X1, myoctaword@GOTPAGE
+l16: 	ADRP	X1, myoctaword@PAGE
+	ADD	X1, myoctaword@PAGEOFF
 	LDP	X2, X3, [X1]
 	STP	X2, X3, [X1]
 

Chapter 5/upper.s

@@ -12,8 +12,10 @@
 .global _start	            // Provide program starting address to linker
 .p2align 2
 
-_start: ADRP	X4, instr@GOTPAGE // start of input string
-	ADRP	X3, outstr@GOTPAGE // address of output string
+_start: ADRP	X4, instr@PAGE // start of input string
+	ADD	X4, X4, instr@PAGEOFF
+	ADRP	X3, outstr@PAGE // address of output string
+	ADD	X3, X3, outstr@PAGEOFF
 // The loop is until byte pointed to by X1 is non-zero
 loop:	LDRB	W5, [X4], #1	// load character and increment pointer
 // If W5 > 'z' then goto cont
@@ -32,7 +34,8 @@ cont:	// end if
 // Setup the parameters to print our hex number
 // and then call the Kernel to do it.
 	MOV	X0, #1	    // 1 = StdOut
-	ADRP	X1, outstr@GOTPAGE // string to print
+	ADRP	X1, outstr@PAGE // string to print
+	ADD	X1, X1, outstr@PAGEOFF
 	SUB	X2, X3, X1  // get the length by subtracting the pointers
 	MOV	X16, #4	    // Unix write system call
 	SVC	#0x80 	    // Call kernel to output the string