Fix build of sparc64 port & implement setjmp/longjmp

diff -u -p -r1.3 elf.h
@@ -514,6 +514,10 @@ typedef struct
 #define ELF64_R_SYM(i)			((i) >> 32)
 #define ELF64_R_TYPE(i)			((i) & 0xffffffff)
 #define ELF64_R_INFO(sym,type)		((((Elf64_Xword) (sym)) << 32) + (type))
+#define ELF64_R_TYPE_DATA(info)		(((Elf64_Xword)(info) << 32) >> 40)
+#define ELF64_R_TYPE_ID(info)		(((Elf64_Xword)(info) << 56) >> 56)
+#define ELF64_R_TYPE_INFO(data, type)	(((Elf64_Xword)(sym) << 8) + \
+					 (Elf64_Xword)(type))
 
 /* Program segment header.  */
 

diff -u -p -r1.2 setjmp.h
@@ -20,8 +20,9 @@
 #ifndef GRUB_SETJMP_CPU_HEADER
 #define GRUB_SETJMP_CPU_HEADER	1
 
-/* FIXME (sparc64).  */
-typedef unsigned long grub_jmp_buf[20];
+#include <grub/types.h>
+
+typedef grub_uint64_t grub_jmp_buf[10];
 
 int grub_setjmp (grub_jmp_buf env);
 void grub_longjmp (grub_jmp_buf env, int val) __attribute__ ((noreturn));

diff -u -p -r1.2 dl.c
@@ -96,40 +96,57 @@ grub_arch_dl_relocate_symbols (grub_dl_t
 				     + entsize * ELF64_R_SYM (rel->r_info));
 
 		value = sym->st_value + rel->r_addend;
-		switch (ELF64_R_TYPE (rel->r_info))
+		switch (ELF64_R_TYPE_ID (ELF64_R_TYPE (rel->r_info)))
 		  {
                   case R_SPARC_32: /* 3 V-word32 */
                     if (value & 0xFFFFFFFF00000000)
                       return grub_error (GRUB_ERR_BAD_MODULE,
                                          "Address out of 32 bits range");
-                    *addr = value;
+                    *addr = (grub_uint32_t) (value & 0xFFFFFFFF);
                     break;
                   case R_SPARC_WDISP30: /* 7 V-disp30 */
-                    if (((value - (Elf64_Addr) addr) & 0xFFFFFFFF00000000) &&
-                        ((value - (Elf64_Addr) addr) & 0xFFFFFFFF00000000
-                        != 0xFFFFFFFF00000000))
+                    if ((value - (Elf64_Addr) addr) & 0x3)
                       return grub_error (GRUB_ERR_BAD_MODULE,
-                                         "Displacement out of 30 bits range");
+                              "30 bits displacement is not 4-bytes alligned");
                     *addr = (*addr & 0xC0000000) |
                       (((grub_int32_t) ((value - (Elf64_Addr) addr) >> 2)) &
                        0x3FFFFFFF);
                     break;
                   case R_SPARC_HI22: /* 9 V-imm22 */
-                    if (((grub_int32_t) value) & 0xFF00000000)
+                    if (value & 0xFFFFFFFF00000000)
                       return grub_error (GRUB_ERR_BAD_MODULE,
                                          "High address out of 22 bits range");
-                    *addr = (*addr & 0xFFC00000) | ((value >> 10) & 0x3FFFFF);
+                    *addr = ((*addr) & 0xFFC00000) |
+                            ((((grub_uint32_t) value) >> 10) & 0x3FFFFF);
+                    break;
+                  case R_SPARC_13: /* 11 V-simm13 */
+                    if (value & 0xFFFFFFFFFFFFE000)
+                      return grub_error(GRUB_ERR_BAD_MODULE,
+                                         "Address out of 13 bits range");
+                    *addr = ((*addr) & 0xFFFFE000) |
+                            (((grub_uint32_t) value) & 0x1FFF);
                     break;
                   case R_SPARC_LO10: /* 12 T-simm13 */
-                    *addr = (*addr & 0xFFFFFC00) | (value & 0x3FF);
+                    *addr = ((*addr) & 0xFFFFFC00) |
+                            (((grub_uint32_t) value) & 0x3FF);
                     break;
                   case R_SPARC_64: /* 32 V-xwords64 */
                     *(Elf64_Xword *) addr = value;
                     break;
+                  case R_SPARC_OLO10: /* 33 V-simm13 */
+                    {
+                      grub_uint32_t delta = ((grub_uint32_t) value & 0x3FF) +
+                               ELF64_R_TYPE_DATA (ELF64_R_TYPE (rel->r_info));
+                      if (delta & 0xFFFFE000)
+                        return grub_error(GRUB_ERR_BAD_MODULE,
+                                           "Address out of 13 bits range");
+                      *addr = ((*addr) & 0xFFFFFE000) | delta;
+                      break;
+                    }
 		  default:
 		    return grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET,
 				       "This relocation (%d) is not implemented yet",
-				       ELF64_R_TYPE (rel->r_info));
+				       ELF64_R_TYPE_ID (ELF64_R_TYPE (rel->r_info)));
 		  }
 	      }
 	  }

diff -u -p -r1.2 init.c
@@ -140,6 +140,34 @@ grub_machine_set_prefix (void)
   grub_free (prefix);
 }
 
+/* Claim some available memory in the first /memory node. */
+static void grub_claim_heap (unsigned long heaplimit)
+{
+  auto int heap_init (grub_uint64_t addr, grub_uint64_t len);
+  int heap_init (grub_uint64_t addr, grub_uint64_t len)
+  {
+    len -= 1; /* Required for some firmware.  */
+
+    /* Don't claim anything above `heaplimit'.  */
+    if (addr + len > heaplimit)
+      len = heaplimit - addr;
+
+    if (len)
+      {
+        /* Claim and use it.  */
+        if (grub_claimmap (addr, len) < 0)
+          return grub_error (GRUB_ERR_OUT_OF_MEMORY,
+                             "Failed to claim heap at 0x%llx, len 0x%llx\n",
+                             addr, len);
+        grub_mm_init_region ((void *) (grub_addr_t) addr, len);
+      }
+
+    return 0;
+  }
+
+  grub_available_iterate (heap_init);
+}
+
 void
 grub_machine_init (void)
 {

@@ -208,7 +236,7 @@ grub_machine_fini (void)
 void
 grub_exit (void)
 {
-  grub_ieee1275_enter ();
+  grub_ieee1275_exit ();
 }
 
 grub_uint32_t

69 lines not on this page · raw message

diff -u -p -r1.19 main.c
@@ -30,7 +30,7 @@
 #include <grub/parser.h>
 #include <grub/script.h>
 
-grub_jmp_buf grub_exit_env;
+grub_jmp_buf grub_exit_env __attribute__ ((__aligned__(8)));
 
 static grub_fs_module_list_t fs_module_list = 0;