From 8ac14cbc052e78485c61a7b3b7727188e4ec30b4 Mon Sep 17 00:00:00 2001
From: jmcmullan <jmcmullan@fb15a70f-31f2-0310-bbcc-cdcc74a49acc>
Date: Mon, 16 Jul 2012 21:05:13 +0000
Subject: [PATCH] exec.library: Move task storage slot functions to the end,
 bump the ABI version

Yes, I do plan on having limited MorphOS binary compatibility for
my Sam460 PowerPC port, so this will be needed.

Signed-off-by: Jason S. McMullan <jason.mcmullan@gmail.com>

git-svn-id: https://svn.aros.org/svn/aros/trunk/AROS@45239 fb15a70f-31f2-0310-bbcc-cdcc74a49acc
---
 rom/exec/alloctaskstorageslot.c |  2 +-
 rom/exec/exec.conf              | 17 ++++++++++-------
 rom/exec/freetaskstorageslot.c  |  2 +-
 rom/exec/restoretaskstorage.c   |  2 +-
 rom/exec/savetaskstorage.c      |  2 +-
 5 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/rom/exec/alloctaskstorageslot.c b/rom/exec/alloctaskstorageslot.c
index 5b6461b686..898b0159ce 100644
--- a/rom/exec/alloctaskstorageslot.c
+++ b/rom/exec/alloctaskstorageslot.c
@@ -17,7 +17,7 @@
         AROS_LH0(int, AllocTaskStorageSlot,
 
 /*  LOCATION */
-        struct ExecBase *, SysBase, 139, Exec)
+        struct ExecBase *, SysBase, 180, Exec)
 
 /*  FUNCTION
         This function will allocate a slot in the taskstorage 
diff --git a/rom/exec/exec.conf b/rom/exec/exec.conf
index d2aa71bc4d..7f297156ef 100644
--- a/rom/exec/exec.conf
+++ b/rom/exec/exec.conf
@@ -1,5 +1,5 @@
 ##begin config
-version 45.0
+version 51.0
 libbase SysBase
 libbasetype struct IntExecBase
 libbasetypeextern struct ExecBase
@@ -212,8 +212,8 @@ ULONG ReadGayle() ()
 STRPTR VNewRawDoFmt(CONST_STRPTR FormatString, VOID_FUNC PutChProc, APTR PutChData, va_list VaListStream) (A0, A2, A3, A1)
 .version 45
 void NewMinList(struct MinList *ml) (A0)
-int AllocTaskStorageSlot() ()
-void FreeTaskStorageSlot(int slot) (D0)
+.skip 1 # MorphOS: CacheInvalidInstArea(APTR Address, ULONG Size) (A0, D0)
+.skip 1 # MorphOS: CacheInvalidDataArea(APTR Address, ULONG Size) (A0, D0)
 .skip 1 # MorphOS: CacheFlushDataInstArea(APTR Address, ULONG Size) (A0, D0)
 .version 45
 struct AVLNode *AVL_AddNode(struct AVLNode **root, struct AVLNode *node, AVLNODECOMP func) (A0, A1, A2)
@@ -253,10 +253,13 @@ ULONG ShutdownA(ULONG action) (D0)
 struct MemList *NewAllocEntry(struct MemList *entry, ULONG *return_flags) (A0, A1)
 .skip 1 # MorphOS: ULONG AvailPool(APTR poolHeader, ULONG flags) (base,sysv)
 APTR NewAddTask(struct Task *task, APTR initialPC, APTR finalPC, struct TagItem *tagList) (A1, A2, A3, A4)
+# MorphOS functions follow:
+.skip 1 # void PutMsgHead(struct MsgPort *port, struct Message *message) (base,sysv)
+.skip 1 # ULONG NewGetTaskPIDAttrsA(ULONG pid, APTR data, ULONG dataSize, ULONG type, struct TagItem *tags) (D0, A0, D1, D2, A1)
+.skip 1 # ULONG NewGetTaskPIDAttrsA(ULONG pid, APTR data, ULONG dataSize, ULONG type, struct TagItem *tags) (D0, A0, D1, D2, A1)
+.version 51
+LONG AllocTaskStorageSlot() ()
+VOID FreeTaskStorageSlot(LONG slot) (D0)
 APTR SaveTaskStorage() ()
 void RestoreTaskStorage(APTR id) (A0) 
-# MorphOS functions follow:
-# void PutMsgHead(struct MsgPort *port, struct Message *message) (base,sysv)
-# ULONG NewGetTaskPIDAttrsA(ULONG pid, APTR data, ULONG dataSize, ULONG type, struct TagItem *tags) (D0, A0, D1, D2, A1)
-# ULONG NewGetTaskPIDAttrsA(ULONG pid, APTR data, ULONG dataSize, ULONG type, struct TagItem *tags) (D0, A0, D1, D2, A1)
 ##end functionlist
diff --git a/rom/exec/freetaskstorageslot.c b/rom/exec/freetaskstorageslot.c
index 66ba54d4e5..75945c5eaf 100644
--- a/rom/exec/freetaskstorageslot.c
+++ b/rom/exec/freetaskstorageslot.c
@@ -15,7 +15,7 @@
 
 /*  LOCATION */
         AROS_LHA(int, slot, D0),
-        struct ExecBase *, SysBase, 140, Exec)
+        struct ExecBase *, SysBase, 181, Exec)
 
 /*  FUNCTION
         This function will free a slot in taskstorage 
diff --git a/rom/exec/restoretaskstorage.c b/rom/exec/restoretaskstorage.c
index 8183507712..bd17df1111 100644
--- a/rom/exec/restoretaskstorage.c
+++ b/rom/exec/restoretaskstorage.c
@@ -22,7 +22,7 @@
 
 /*  LOCATION */
         AROS_LHA(APTR, id, A0),
-        struct ExecBase *, SysBase, 178, Exec)
+        struct ExecBase *, SysBase, 183, Exec)
 
 /*  FUNCTION
         The will remmeber the current state of the task storage slots
diff --git a/rom/exec/savetaskstorage.c b/rom/exec/savetaskstorage.c
index 026c56db90..d96d5acd15 100644
--- a/rom/exec/savetaskstorage.c
+++ b/rom/exec/savetaskstorage.c
@@ -20,7 +20,7 @@
         AROS_LH0(APTR, SaveTaskStorage,
 
 /*  LOCATION */
-        struct ExecBase *, SysBase, 177, Exec)
+        struct ExecBase *, SysBase, 182, Exec)
 
 /*  FUNCTION
         The will remember the current state of the task storage slots
-- 
2.11.4.GIT