Merge pull request #30 from frangarcj/master

(VITA) Change libco and some optimizations

3 files changed, 102 insertions, 4 deletions

diff --git a/Makefile b/Makefile
index eccab17..9ddbd54 100644
--- a/Makefile
+++ b/Makefile
@@ -195,11 +195,13 @@ else ifeq ($(platform), vita)
 	TARGET := $(TARGET_NAME)_libretro_$(platform).a
 	CC = arm-vita-eabi-gcc$(EXE_EXT)
 	AR = arm-vita-eabi-ar$(EXE_EXT)
-	CFLAGS += -DVITA -g
-	CFLAGS += -mthumb -mcpu=cortex-a9 -mfloat-abi=hard
+	CFLAGS += -DVITA
+	CFLAGS += -mcpu=cortex-a9 -mfloat-abi=hard
 	CFLAGS += -Wall -mword-relocations
 	CFLAGS += -fomit-frame-pointer -ffast-math
-	ASFLAGS += -mthumb -mcpu=cortex-a9
+	CFLAGS += -mword-relocations -fno-unwind-tables -fno-asynchronous-unwind-tables 
+	CFLAGS += -ftree-vectorize -fno-optimize-sibling-calls
+	ASFLAGS += -mcpu=cortex-a9
 	STATIC_LINKING = 1
 	CPU_ARCH := arm
 
diff --git a/libco/libco.c b/libco/libco.c
index 7bcbbd0..e80fe57 100644
--- a/libco/libco.c
+++ b/libco/libco.c
@@ -11,7 +11,7 @@
 #elif defined(__GNUC__) && defined(_ARCH_PPC)
   #include "ppc.c"
 #elif defined(VITA)
-  #include "psp2.c"
+  #include "scefiber.c"
 #elif defined(__GNUC__) && (defined(__ARM_EABI__) || defined(__arm__))
   #include "armeabi.c"
 #elif defined(__GNUC__)
diff --git a/libco/scefiber.c b/libco/scefiber.c
new file mode 100644
index 0000000..a233bec
--- /dev/null
+++ b/libco/scefiber.c
@@ -0,0 +1,96 @@
+/*
+  libco.win (2016-09-06)
+  authors: frangarcj
+  license: public domain
+*/
+
+#define LIBCO_C
+#include <libco.h>
+#include <stdlib.h>
+#include <psp2/sysmodule.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+static thread_local cothread_t co_active_ = 0;
+
+typedef struct SceFiber {
+	char reserved[128];
+} SceFiber __attribute__( ( aligned ( 8 ) ) ) ;
+
+int32_t _sceFiberInitializeImpl(SceFiber* fiber, char* name, void* entry, uint32_t argOnInitialize, void* addrContext, int32_t sizeContext, void* params);
+
+int32_t sceFiberFinalize(SceFiber* fiber);
+
+int32_t sceFiberRun(SceFiber* fiber, uint32_t argOnRunTo, uint32_t* argOnRun);
+
+int32_t sceFiberSwitch(SceFiber* fiber, uint32_t argOnRunTo, uint32_t* argOnRun);
+
+int32_t sceFiberReturnToThread(uint32_t argOnReturn, uint32_t* argOnRun);
+
+void co_thunk(uint32_t argOnInitialize, uint32_t argOnRun)
+{
+   ((void (*)(void))argOnInitialize)();
+}
+
+cothread_t co_active(void)
+{
+   if(!co_active_)
+   {
+		  sceSysmoduleLoadModule(SCE_SYSMODULE_FIBER);
+      co_active_ = (cothread_t)1;
+   }
+   return co_active_;
+}
+
+cothread_t co_create(unsigned int heapsize, void (*coentry)(void))
+{
+   SceFiber* tailFiber = malloc(sizeof(SceFiber));
+	 char * m_contextBuffer = malloc(sizeof(char)*heapsize);
+	 if(!co_active_)
+   {
+      sceSysmoduleLoadModule(SCE_SYSMODULE_FIBER);
+      co_active_ = (cothread_t)1;
+   }
+
+   //_sceFiberInitializeImpl
+   int ret = _sceFiberInitializeImpl(tailFiber, "tailFiber", co_thunk, (uint32_t)coentry, (void*) m_contextBuffer, heapsize, NULL);
+   if(ret==0){
+     return (cothread_t)tailFiber;
+   }else{
+     return (cothread_t)ret;
+   }
+
+}
+
+void co_delete(cothread_t cothread)
+{
+	 if(cothread == (cothread_t)1){
+		 return;
+	 }
+   sceFiberFinalize((SceFiber*)cothread);
+}
+
+void co_switch(cothread_t cothread)
+{
+
+   uint32_t argOnReturn = 0;
+   if(cothread == (cothread_t)1){
+     co_active_ = cothread;
+     sceFiberReturnToThread(0, NULL);
+   }else{
+		 SceFiber* theFiber = (SceFiber*)cothread;
+		 if(co_active_ == (cothread_t)1){
+			 co_active_ = cothread;
+			 sceFiberRun(theFiber, 0, &argOnReturn);
+		 }else{
+			 co_active_ = cothread;
+			 sceFiberSwitch(theFiber, 0, &argOnReturn);
+		 }
+   }
+}
+
+#ifdef __cplusplus
+}
+#endif