From f6e869a7e05b909fe136b1cff4b17cf55d78024e Mon Sep 17 00:00:00 2001
From: twilen <twilen@fb15a70f-31f2-0310-bbcc-cdcc74a49acc>
Date: Sat, 21 Jul 2012 15:20:59 +0000
Subject: [PATCH] Cleanup, added HUNK_ADVISORY support.

git-svn-id: https://svn.aros.org/svn/aros/trunk/AROS@45284 fb15a70f-31f2-0310-bbcc-cdcc74a49acc
---
 rom/dos/internalloadseg_aos.c | 73 ++++++++++++-------------------------------
 1 file changed, 20 insertions(+), 53 deletions(-)

diff --git a/rom/dos/internalloadseg_aos.c b/rom/dos/internalloadseg_aos.c
index 4a6721575f..cfafa8646c 100644
--- a/rom/dos/internalloadseg_aos.c
+++ b/rom/dos/internalloadseg_aos.c
@@ -135,38 +135,24 @@ BPTR InternalLoadSeg_AOS(BPTR fh,
       goto end;
 
     count = AROS_BE2LONG(count);
-
-    tmp = count & 0xFF000000;
+    tmp = count & (HUNKF_FAST | HUNKF_CHIP);
     count &= 0xFFFFFF;
     D(bug("\tHunk %d size: 0x%06lx bytes in ", i, count*4));
     req = MEMF_CLEAR | MEMF_PUBLIC;
-
-    switch(tmp)
-    {
-      case HUNKF_FAST:
+    if (tmp == (HUNKF_FAST | HUNKF_CHIP)) {
+      if (read_block(fh, &req, sizeof(req), funcarray, DOSBase))
+        goto end;
+      req = AROS_BE2LONG(req);
+      D(bug("FLAGS=%08x", req));
+    } else if (tmp == HUNKF_FAST) {
       D(bug("FAST"));
       req |= MEMF_FAST;
-      break;
-
-      case HUNKF_CHIP:
+    } else if (tmp == HUNKF_CHIP) {
       D(bug("CHIP"));
       req |= MEMF_CHIP;
-      break;
-
-      case HUNKF_FAST | HUNKF_CHIP:
-      D(bug("FAST | CHIP"));
-      if (read_block(fh, &req, sizeof(req), funcarray, DOSBase))
-        goto end;
-      req = AROS_BE2LONG(req);
-      break;
-
-      default:
-      D(bug("ANY"));
-      req |= MEMF_ANY;
-      break;
     }
-
     D(bug(" memory"));
+
     /*
      * We need space for the code, the length of this hunk and
      * for a pointer to the next hunk.
@@ -252,34 +238,6 @@ BPTR InternalLoadSeg_AOS(BPTR fh,
           D(bug("HUNK_%s(%d): Length: 0x%06lx bytes in ",
           segtypes[(hunktype & 0xFFFFFF)-HUNK_CODE], curhunk, count*4));
 
-        switch(hunktype & 0xFF000000)
-        {
-          case HUNKF_FAST:
-            D(bug("FAST"));
-            req = MEMF_FAST;
-          break;
-
-          case HUNKF_CHIP:
-            D(bug("CHIP"));
-            req = MEMF_CHIP;
-          break;
-
-          case HUNKF_FAST | HUNKF_CHIP:
-            D(bug("FAST | CHIP"));
-            if (read_block(fh, &req, sizeof(req), funcarray, DOSBase))
-              goto end;
-
-            req = AROS_BE2LONG(req);
-
-          break;
-
-          default:
-            D(bug("ANY"));
-            req = MEMF_ANY;
-          break;
-        }
-
-        D(bug(" memory\n"));
         if ((hunktype & 0xFFFFFF) != HUNK_BSS && count)
 	{
           if (read_block(fh, GETHUNKPTR(curhunk), count*4, funcarray, DOSBase))
@@ -464,8 +422,17 @@ BPTR InternalLoadSeg_AOS(BPTR fh,
         goto done;
 
       default:
-        bug("Hunk type 0x%06lx not implemented\n", hunktype & 0xFFFFFF);
-        ERROR(ERROR_BAD_HUNK);
+        if (hunktype & HUNKF_ADVISORY) {
+          D(bug("Unknown hunk 0x%06lx with advisory flag skipped\n", hunktype & 0xFFFFFF));
+          if (read_block(fh, &count, sizeof(count), funcarray, DOSBase))
+            goto end;
+          count = AROS_BE2LONG(count);
+          if (seek_forward(fh, count * 4, funcarray, DOSBase))
+            goto end;
+        } else {
+          bug("Hunk type 0x%06lx not implemented\n", hunktype & 0xFFFFFF);
+          ERROR(ERROR_BAD_HUNK);
+        }
     } /* switch */
   } /* while */
 done:
-- 
2.11.4.GIT