From 3c9c19604ea66f33dba496e660dd846a333ab9a6 Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Thu, 23 Aug 2012 06:39:14 +0000 Subject: [PATCH] cothread removed, was not used for a long time and was commented (no whatsnew) --- .gitattributes | 20 -- src/emu/cothread.c | 95 ------ src/emu/cothread.h | 88 ------ src/emu/diexec.c | 20 -- src/emu/diexec.h | 11 - src/emu/schedule.c | 1 - src/emu/schedule.h | 2 - src/lib/cothread/amd64.c | 104 ------- src/lib/cothread/doc/amd64.asm | 85 ------ src/lib/cothread/doc/style.css | 8 - src/lib/cothread/doc/targets.html | 89 ------ src/lib/cothread/doc/usage.html | 107 ------- src/lib/cothread/doc/x86.asm | 21 -- src/lib/cothread/fiber.c | 51 ---- src/lib/cothread/libco.c | 23 -- src/lib/cothread/libco.h | 34 --- src/lib/cothread/ppc.c | 411 -------------------------- src/lib/cothread/sjlj.c | 102 ------- src/lib/cothread/test/cc.bat | 4 - src/lib/cothread/test/cc.sh | 5 - src/lib/cothread/test/test.h | 6 - src/lib/cothread/test/test_args.cpp | 76 ----- src/lib/cothread/test/test_timing.cpp | 52 ---- src/lib/cothread/ucontext.c | 67 ----- src/lib/cothread/x86.c | 100 ------- 25 files changed, 1582 deletions(-) delete mode 100644 src/emu/cothread.c delete mode 100644 src/emu/cothread.h delete mode 100644 src/lib/cothread/amd64.c delete mode 100644 src/lib/cothread/doc/amd64.asm delete mode 100644 src/lib/cothread/doc/style.css delete mode 100644 src/lib/cothread/doc/targets.html delete mode 100644 src/lib/cothread/doc/usage.html delete mode 100644 src/lib/cothread/doc/x86.asm delete mode 100644 src/lib/cothread/fiber.c delete mode 100644 src/lib/cothread/libco.c delete mode 100644 src/lib/cothread/libco.h delete mode 100644 src/lib/cothread/ppc.c delete mode 100644 src/lib/cothread/sjlj.c delete mode 100644 src/lib/cothread/test/cc.bat delete mode 100644 src/lib/cothread/test/cc.sh delete mode 100644 src/lib/cothread/test/test.h delete mode 100644 src/lib/cothread/test/test_args.cpp delete mode 100644 src/lib/cothread/test/test_timing.cpp delete mode 100644 src/lib/cothread/ucontext.c delete mode 100644 src/lib/cothread/x86.c diff --git a/.gitattributes b/.gitattributes index d5a3598764a..9395f9bbc4a 100644 --- a/.gitattributes +++ b/.gitattributes @@ -237,8 +237,6 @@ src/emu/clifront.c svneol=native#text/plain src/emu/clifront.h svneol=native#text/plain src/emu/config.c svneol=native#text/plain src/emu/config.h svneol=native#text/plain -src/emu/cothread.c svneol=native#text/plain -src/emu/cothread.h svneol=native#text/plain src/emu/cpu/adsp2100/2100dasm.c svneol=native#text/plain src/emu/cpu/adsp2100/2100ops.c svneol=native#text/plain src/emu/cpu/adsp2100/adsp2100.c svneol=native#text/plain @@ -1641,24 +1639,6 @@ src/ldplayer/layout/pr8210.lay svneol=native#text/plain src/ldplayer/ldplayer.c svneol=native#text/plain src/ldplayer/ldplayer.lst svneol=native#text/plain src/ldplayer/ldplayer.mak svneol=native#text/plain -src/lib/cothread/amd64.c svneol=native#text/plain -src/lib/cothread/doc/amd64.asm svneol=native#text/plain -src/lib/cothread/doc/style.css svneol=native#text/plain -src/lib/cothread/doc/targets.html svneol=native#text/plain -src/lib/cothread/doc/usage.html svneol=native#text/plain -src/lib/cothread/doc/x86.asm svneol=native#text/plain -src/lib/cothread/fiber.c svneol=native#text/plain -src/lib/cothread/libco.c svneol=native#text/plain -src/lib/cothread/libco.h svneol=native#text/plain -src/lib/cothread/ppc.c svneol=native#text/plain -src/lib/cothread/sjlj.c svneol=native#text/plain -src/lib/cothread/test/cc.bat svneol=native#text/plain -src/lib/cothread/test/cc.sh svneol=native#text/plain -src/lib/cothread/test/test.h svneol=native#text/plain -src/lib/cothread/test/test_args.cpp svneol=native#text/plain -src/lib/cothread/test/test_timing.cpp svneol=native#text/plain -src/lib/cothread/ucontext.c svneol=native#text/plain -src/lib/cothread/x86.c svneol=native#text/plain src/lib/expat/ascii.h svneol=native#text/plain src/lib/expat/asciitab.h svneol=native#text/plain src/lib/expat/expat.h svneol=native#text/plain diff --git a/src/emu/cothread.c b/src/emu/cothread.c deleted file mode 100644 index 4dbce1fa465..00000000000 --- a/src/emu/cothread.c +++ /dev/null @@ -1,95 +0,0 @@ -/*************************************************************************** - - cothread.c - - Class wrapper around byuu's cothread library. - -**************************************************************************** - - Copyright Aaron Giles - All rights reserved. - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are - met: - - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in - the documentation and/or other materials provided with the - distribution. - * Neither the name 'MAME' nor the names of its contributors may be - used to endorse or promote products derived from this software - without specific prior written permission. - - THIS SOFTWARE IS PROVIDED BY AARON GILES ''AS IS'' AND ANY EXPRESS OR - IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - DISCLAIMED. IN NO EVENT SHALL AARON GILES BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, - STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING - IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -***************************************************************************/ - -#include "emu.h" -#include "cothread/libco.h" - - -//************************************************************************** -// GLOBAL VARIABLES -//************************************************************************** - -// static members of the cothread class -osd_lock *cothread::s_create_lock = osd_lock_alloc(); -cothread *cothread::s_create_cothread; - - - -//************************************************************************** -// COTHREAD -//************************************************************************** - -//------------------------------------------------- -// cothread - constructor -//------------------------------------------------- - -cothread::cothread(cothread_t existing_thread) - : m_cothread(existing_thread), - m_creator_cothread(NULL) -{ -} - -cothread::cothread(cothread_entry_delegate entry, size_t stack) - : m_cothread(NULL), - m_creator_cothread(co_active()), - m_entry(entry) -{ - // due to the lack of input parameter to the entry function, - // all cothread creation is explicitly serialized - osd_lock_acquire(s_create_lock); - s_create_cothread = this; - m_cothread = co_create(stack, &cothread_entry); - co_switch(m_cothread); - osd_lock_release(s_create_lock); -} - - -//------------------------------------------------- -// cothread_entry - static entry point -//------------------------------------------------- - -void cothread::cothread_entry() -{ - // on first call, retrieve the static pointer and return - cothread *thread = s_create_cothread; - co_switch(thread->m_creator_cothread); - - // when actually swapped in later, call the entry point - thread->m_entry(); -} diff --git a/src/emu/cothread.h b/src/emu/cothread.h deleted file mode 100644 index e75dee02f59..00000000000 --- a/src/emu/cothread.h +++ /dev/null @@ -1,88 +0,0 @@ -/*************************************************************************** - - cothread.h - - Class wrapper around byuu's cothread library. - -**************************************************************************** - - Copyright Aaron Giles - All rights reserved. - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are - met: - - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in - the documentation and/or other materials provided with the - distribution. - * Neither the name 'MAME' nor the names of its contributors may be - used to endorse or promote products derived from this software - without specific prior written permission. - - THIS SOFTWARE IS PROVIDED BY AARON GILES ''AS IS'' AND ANY EXPRESS OR - IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - DISCLAIMED. IN NO EVENT SHALL AARON GILES BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, - STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING - IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -***************************************************************************/ - -#pragma once - -#ifndef __EMU_H__ -#error Dont include this file directly; include emu.h instead. -#endif - -#ifndef __COTHREAD_H__ -#define __COTHREAD_H__ - -#include "cothread/libco.h" - - -//************************************************************************** -// TYPE DEFINITIONS -//************************************************************************** - -// delegate that points to a thread's entry -typedef delegate cothread_entry_delegate; - - -// ======================> cothread - -class cothread -{ -public: - // construction/destruction - cothread(cothread_t existing_thread); - cothread(cothread_entry_delegate entry, size_t stack = 1048576); - ~cothread() { if (m_creator_cothread != NULL) co_delete(m_cothread); } - - // switching - void make_active() { co_switch(m_cothread); } - -private: - // internal helpers - static void cothread_entry(); - - // internal state - cothread_t m_cothread; - cothread_t m_creator_cothread; - cothread_entry_delegate m_entry; - - // static state - static osd_lock * s_create_lock; - static cothread * s_create_cothread; -}; - - -#endif // __COTHREAD_H__ diff --git a/src/emu/diexec.c b/src/emu/diexec.c index 1d9f1732150..213f831c51a 100644 --- a/src/emu/diexec.c +++ b/src/emu/diexec.c @@ -72,7 +72,6 @@ const int TRIGGER_SUSPENDTIME = -4000; device_execute_interface::device_execute_interface(const machine_config &mconfig, device_t &device) : device_interface(device), -// m_cothread(cothread_entry_delegate(FUNC(device_execute_interface::run_thread_wrapper), this)), m_disabled(false), m_vblank_interrupt_legacy(NULL), m_vblank_interrupt_screen(NULL), @@ -387,25 +386,6 @@ UINT64 device_execute_interface::total_cycles() const } -//------------------------------------------------- -// run_thread_wrapper - wrapper for our cothread -// which just calls run and then returns to the -// scheduler thread, over and over -//------------------------------------------------- -/* -void device_execute_interface::run_thread_wrapper() -{ - // loop infinitely - device_scheduler &scheduler = device().machine().scheduler(); - while (1) - { - // call the classic run function, then swap back to the scheduler's thread - execute_run(); - scheduler.make_active(); - } -} -*/ - //------------------------------------------------- // execute_clocks_to_cycles - convert the number // of clocks to cycles, rounding down if necessary diff --git a/src/emu/diexec.h b/src/emu/diexec.h index 091c3fa8c4d..ecfeba6eba8 100644 --- a/src/emu/diexec.h +++ b/src/emu/diexec.h @@ -47,10 +47,6 @@ #define __DIEXEC_H__ -// set to 1 to execute on cothread instead of directly -//#define USE_COTHREADS 1 - - //************************************************************************** // CONSTANTS //************************************************************************** @@ -222,11 +218,7 @@ public: UINT64 total_cycles() const; // required operation overrides -//#if USE_COTHREADS -// void run() { m_cothread.make_active(); } -//#else void run() { execute_run(); } -//#endif protected: // internal helpers @@ -289,9 +281,6 @@ protected: void empty_event_queue(); }; - // internal state -// cothread m_cothread; // thread used for execution - // configuration bool m_disabled; // disabled from executing? device_interrupt_delegate m_vblank_interrupt; // for interrupts tied to VBLANK diff --git a/src/emu/schedule.c b/src/emu/schedule.c index c14df282e6d..d4426c6c0df 100644 --- a/src/emu/schedule.c +++ b/src/emu/schedule.c @@ -343,7 +343,6 @@ device_scheduler::device_scheduler(running_machine &machine) : m_executing_device(NULL), m_execute_list(NULL), m_basetime(attotime::zero), -// m_cothread(co_active()), m_timer_list(NULL), m_timer_allocator(machine.respool()), m_callback_timer(NULL), diff --git a/src/emu/schedule.h b/src/emu/schedule.h index 6ef60ce0f9c..36694b5018f 100644 --- a/src/emu/schedule.h +++ b/src/emu/schedule.h @@ -165,7 +165,6 @@ public: void abort_timeslice(); void trigger(int trigid, attotime after = attotime::zero); void boost_interleave(attotime timeslice_time, attotime boost_duration); -// void make_active() { m_cothread.make_active(); } // timers, specified by callback/name emu_timer *timer_alloc(timer_expired_delegate callback, void *ptr = NULL); @@ -210,7 +209,6 @@ private: device_execute_interface * m_executing_device; // pointer to currently executing device device_execute_interface * m_execute_list; // list of devices to be executed attotime m_basetime; // global basetime; everything moves forward from here -// cothread m_cothread; // core scheduler thread // list of active timers emu_timer * m_timer_list; // head of the active list diff --git a/src/lib/cothread/amd64.c b/src/lib/cothread/amd64.c deleted file mode 100644 index 4997c357dc6..00000000000 --- a/src/lib/cothread/amd64.c +++ /dev/null @@ -1,104 +0,0 @@ -/* - libco.amd64 (2009-10-12) - author: byuu - license: public domain -*/ - -#define LIBCO_C -#include "libco.h" -#include -#include - -#ifdef __cplusplus -extern "C" { -#endif - -static thread_local long long co_active_buffer[64]; -static thread_local cothread_t co_active_handle = 0; -static void (*co_swap)(cothread_t, cothread_t) = 0; - -#ifdef _WIN32 - //ABI: Win64 - static unsigned char co_swap_function[] = { - 0x48, 0x89, 0x22, 0x48, 0x8B, 0x21, 0x58, 0x48, 0x89, 0x6A, 0x08, 0x48, 0x89, 0x72, 0x10, 0x48, - 0x89, 0x7A, 0x18, 0x48, 0x89, 0x5A, 0x20, 0x4C, 0x89, 0x62, 0x28, 0x4C, 0x89, 0x6A, 0x30, 0x4C, - 0x89, 0x72, 0x38, 0x4C, 0x89, 0x7A, 0x40, 0x48, 0x81, 0xC2, 0x80, 0x00, 0x00, 0x00, 0x48, 0x83, - 0xE2, 0xF0, 0x0F, 0x29, 0x32, 0x0F, 0x29, 0x7A, 0x10, 0x44, 0x0F, 0x29, 0x42, 0x20, 0x44, 0x0F, - 0x29, 0x4A, 0x30, 0x44, 0x0F, 0x29, 0x52, 0x40, 0x44, 0x0F, 0x29, 0x5A, 0x50, 0x44, 0x0F, 0x29, - 0x62, 0x60, 0x44, 0x0F, 0x29, 0x6A, 0x70, 0x44, 0x0F, 0x29, 0xB2, 0x80, 0x00, 0x00, 0x00, 0x44, - 0x0F, 0x29, 0xBA, 0x90, 0x00, 0x00, 0x00, 0x48, 0x8B, 0x69, 0x08, 0x48, 0x8B, 0x71, 0x10, 0x48, - 0x8B, 0x79, 0x18, 0x48, 0x8B, 0x59, 0x20, 0x4C, 0x8B, 0x61, 0x28, 0x4C, 0x8B, 0x69, 0x30, 0x4C, - 0x8B, 0x71, 0x38, 0x4C, 0x8B, 0x79, 0x40, 0x48, 0x81, 0xC1, 0x80, 0x00, 0x00, 0x00, 0x48, 0x83, - 0xE1, 0xF0, 0x0F, 0x29, 0x31, 0x0F, 0x29, 0x79, 0x10, 0x44, 0x0F, 0x29, 0x41, 0x20, 0x44, 0x0F, - 0x29, 0x49, 0x30, 0x44, 0x0F, 0x29, 0x51, 0x40, 0x44, 0x0F, 0x29, 0x59, 0x50, 0x44, 0x0F, 0x29, - 0x61, 0x60, 0x44, 0x0F, 0x29, 0x69, 0x70, 0x44, 0x0F, 0x29, 0xB1, 0x80, 0x00, 0x00, 0x00, 0x44, - 0x0F, 0x29, 0xB9, 0x90, 0x00, 0x00, 0x00, 0xFF, 0xE0, - }; - - #include - - void co_init() { - DWORD old_privileges; - VirtualProtect(co_swap_function, sizeof co_swap_function, PAGE_EXECUTE_READWRITE, &old_privileges); - } -#else - //ABI: SystemV - static unsigned char co_swap_function[] = { - 0x48, 0x89, 0x26, 0x48, 0x8B, 0x27, 0x58, 0x48, 0x89, 0x6E, 0x08, 0x48, 0x89, 0x5E, 0x10, 0x4C, - 0x89, 0x66, 0x18, 0x4C, 0x89, 0x6E, 0x20, 0x4C, 0x89, 0x76, 0x28, 0x4C, 0x89, 0x7E, 0x30, 0x48, - 0x8B, 0x6F, 0x08, 0x48, 0x8B, 0x5F, 0x10, 0x4C, 0x8B, 0x67, 0x18, 0x4C, 0x8B, 0x6F, 0x20, 0x4C, - 0x8B, 0x77, 0x28, 0x4C, 0x8B, 0x7F, 0x30, 0xFF, 0xE0, - }; - - #include - #include - - void co_init() { - unsigned long long addr = (unsigned long long)co_swap_function; - unsigned long long base = addr - (addr % sysconf(_SC_PAGESIZE)); - unsigned long long size = (addr - base) + sizeof co_swap_function; - mprotect((void*)base, size, PROT_READ | PROT_WRITE | PROT_EXEC); - } -#endif - -static void crash() { - assert(0); /* called only if cothread_t entrypoint returns */ -} - -cothread_t co_active() { - if(!co_active_handle) co_active_handle = &co_active_buffer; - return co_active_handle; -} - -cothread_t co_create(unsigned int size, void (*entrypoint)(void)) { - cothread_t handle; - if(!co_swap) { - co_init(); - co_swap = (void (*)(cothread_t, cothread_t))co_swap_function; - } - if(!co_active_handle) co_active_handle = &co_active_buffer; - size += 512; /* allocate additional space for storage */ - size &= ~15; /* align stack to 16-byte boundary */ - - if((handle = (cothread_t)malloc(size))) { - long long *p = (long long*)((char*)handle + size); /* seek to top of stack */ - *--p = (long long)crash; /* crash if entrypoint returns */ - *--p = (long long)entrypoint; /* start of function */ - *(long long*)handle = (long long)p; /* stack pointer */ - } - - return handle; -} - -void co_delete(cothread_t handle) { - free(handle); -} - -void co_switch(cothread_t handle) { - register cothread_t co_previous_handle = co_active_handle; - co_swap(co_active_handle = handle, co_previous_handle); -} - -#ifdef __cplusplus -} -#endif diff --git a/src/lib/cothread/doc/amd64.asm b/src/lib/cothread/doc/amd64.asm deleted file mode 100644 index 3d02d8b34a6..00000000000 --- a/src/lib/cothread/doc/amd64.asm +++ /dev/null @@ -1,85 +0,0 @@ -; SystemV ABI: -; return = rax -; arguments = rdi,rsi,rdx,rcx,r8,r9 -; non-volatile registers = rbp,rbx,r12-r15 - -co_swap_systemV(to = rdi, from = rsi): - mov [rsi],rsp - mov rsp,[rdi] - pop rax - - mov [rsi+ 8],rbp - mov [rsi+16],rbx - mov [rsi+24],r12 - mov [rsi+32],r13 - mov [rsi+40],r14 - mov [rsi+48],r15 - - mov rbp,[rdi+ 8] - mov rbx,[rdi+16] - mov r12,[rdi+24] - mov r13,[rdi+32] - mov r14,[rdi+40] - mov r15,[rdi+48] - - jmp rax - -; Win64 ABI: -; return = rax -; arguments = rcx,rdx,r8,r9 -; non-volatile registers = rbp,rsi,rdi,rbx,r12-r15 -; non-volatile FPU registers = xmm6-xmm15 - -co_swap_win64(to = rcx, from = rdx): - mov [rdx],rsp - mov rsp,[rcx] - pop rax - - mov [rdx+ 8],rbp - mov [rdx+ 16],rsi - mov [rdx+ 24],rdi - mov [rdx+ 32],rbx - mov [rdx+ 40],r12 - mov [rdx+ 48],r13 - mov [rdx+ 56],r14 - mov [rdx+ 64],r15 - - add rdx,128 - and rdx,~15 - - movaps [rdx+ 0],xmm6 - movaps [rdx+ 16],xmm7 - movaps [rdx+ 32],xmm8 - movaps [rdx+ 48],xmm9 - movaps [rdx+ 64],xmm10 - movaps [rdx+ 80],xmm11 - movaps [rdx+ 96],xmm12 - movaps [rdx+112],xmm13 - movaps [rdx+128],xmm14 - movaps [rdx+144],xmm15 - - mov rbp,[rcx+ 8] - mov rsi,[rcx+ 16] - mov rdi,[rcx+ 24] - mov rbx,[rcx+ 32] - mov r12,[rcx+ 40] - mov r13,[rcx+ 48] - mov r14,[rcx+ 56] - mov r15,[rcx+ 64] - - add rcx,128 - and rcx,~15 - - movaps [rcx+ 0],xmm6 - movaps [rcx+ 16],xmm7 - movaps [rcx+ 32],xmm8 - movaps [rcx+ 48],xmm9 - movaps [rcx+ 64],xmm10 - movaps [rcx+ 80],xmm11 - movaps [rcx+ 96],xmm12 - movaps [rcx+112],xmm13 - movaps [rcx+128],xmm14 - movaps [rcx+144],xmm15 - - jmp rax - diff --git a/src/lib/cothread/doc/style.css b/src/lib/cothread/doc/style.css deleted file mode 100644 index 5181afde6c5..00000000000 --- a/src/lib/cothread/doc/style.css +++ /dev/null @@ -1,8 +0,0 @@ -body { - background: #333; - color: #fff; -} - -code { - background: #444; -} diff --git a/src/lib/cothread/doc/targets.html b/src/lib/cothread/doc/targets.html deleted file mode 100644 index d6211a15d75..00000000000 --- a/src/lib/cothread/doc/targets.html +++ /dev/null @@ -1,89 +0,0 @@ - - - - - - - -Supported targets:

- -Note that supported targets are only those that have been tested and confirmed -working. It is quite possible that libco will work on more processors, compilers -and operating systems than those listed below. -
- -libco.x86
-Overhead: ~5x
-Supported processor(s): 32-bit x86
-Supported compiler(s): any
-Supported operating system(s):
    -
  • Windows
    • -
  • Mac OS X
    • -
  • Linux
    • -
  • BSD
    • -
-
- -libco.amd64
-Overhead: ~10x (Windows), ~6x (all other platforms)
-Supported processor(s): 64-bit amd64
-Supported compiler(s): any
-Supported operating system(s):
    -
  • Windows
    • -
  • Mac OS X
    • -
  • Linux
    • -
  • BSD
    • -
-
- -libco.ppc
-Overhead: ~20x
-Supported processor(s): 32-bit PowerPC, 64-bit PowerPC
-Supported compiler(s): GNU GCC
-Supported operating system(s):
    -
-
  • Mac OS X
    • -
  • Linux
    • -
  • BSD
    • -
  • Playstation 3
    • - -
    - -Note: this module contains compiler flags to enable/disable FPU and Altivec -support. - -
    - -libco.fiber
    -Overhead: ~15x
    -Supported processor(s): Processor independent
    -Supported compiler(s): any
    -Supported operating system(s):
      -
    • Windows
      • -
    -
    - -libco.sjlj
    -Overhead: ~30x
    -Supported processor(s): Processor independent
    -Supported compiler(s): any
    -Supported operating system(s):
      -
    • Mac OS X
      • -
    • Linux
      • -
    • BSD
      • -
    • Solaris
      • -
    -
    - -libco.ucontext
    -Overhead: ~300x
    -Supported processor(s): Processor independent
    -Supported compiler(s): any
    -Supported operating system(s):
      -
    • Linux
      • -
    • BSD
      • -
    -
    - - - diff --git a/src/lib/cothread/doc/usage.html b/src/lib/cothread/doc/usage.html deleted file mode 100644 index 3f0d81ccd88..00000000000 --- a/src/lib/cothread/doc/usage.html +++ /dev/null @@ -1,107 +0,0 @@ - - - - - - - -License:

    -libco is released to the public domain. -
    - -Contact:

    -At present, you may contact me at setsunakun0 at hotmail dot com.
    -I am interested in knowing of any projects that make use of this library, -though this is only a courtesy. -
    - -Foreword:

    -libco is a cross-platform, public domain implementation of -cooperative-multithreading; a feature that is sorely lacking -from the ISO C/C++ standard.
    -The library is designed for maximum speed and portability, and -not for safety or features. If safety or extra functionality is desired, -a wrapper API can easily be written to encapsulate all library functions.
    -Behavior of executing operations that are listed as not permitted -below result in undefined behavior. They may work anyway, they -may cause undesired / unknown behavior, or they may crash the -program entirely.
    -The goal of this library was to simplify the base API as much as possible, -implementing only that which cannot be implemented using pure C. Additional -functionality after this would only complicate ports of this library to new -platforms. -
    - -Porting:

    -This document is included as a reference for porting libco. Please submit any -ports you create to me, so that libco can become more useful. Please note that -since libco is public domain, you must submit your code as a work of the -public domain in order for it to be included in the official distribution. -Full credit will be given in the source code of the official release. Please -do not bother submitting code to me under any other license -- including GPL, -LGPL, BSD or CC -- I am not interested in creating a library with multiple -different licenses depending on which targets are used. -
    - -Synopsis:

    - -typedef void* cothread_t;
    -
    -cothread_t co_active();
    -cothread_t co_create(unsigned int heapsize, void (*coentry)(void));
    -void       co_delete(cothread_t cothread);
    -void       co_switch(cothread_t cothread);
    -     -
    - -Usage: -
    - -typedef void* cothread_t;

    -Handle to cothread.
    -Handle must be of type void*.
    -A value of null (0) indicates an uninitialized or invalid -handle, whereas a non-zero value indicates a valid handle. -
    - -cothread_t co_active();

    -Return handle to current cothread. Always returns a valid handle, even when -called from the main program thread. -
    - -cothread_t co_create(unsigned int heapsize, void (*coentry)(void));

    -Create new cothread.
    -Heapsize is the amount of memory allocated for the cothread stack, specified -in bytes. This is unfortunately impossible to make fully portable. It is -recommended to specify sizes using `n * sizeof(void*)'. It is better to err -on the side of caution and allocate more memory than will be needed to ensure -compatibility with other platforms, within reason. A typical heapsize for a -32-bit architecture is ~1MB.
    -When the new cothread is first called, program execution jumps to coentry. -This function does not take any arguments, due to portability issues with -passing function arguments. However, arguments can be simulated by the use -of global variables, which can be set before the first call to each cothread.
    -coentry() must not return, and should end with an appropriate co_switch() -statement. Behavior is undefined if entry point returns normally.
    -Library is responsible for allocating cothread stack memory, to free -the user from needing to allocate special memory capable of being used -as program stack memory on platforms where this is required.
    -User is always responsible for deleting cothreads with co_delete().
    -Return value of null (0) indicates cothread creation failed. -
    - -void co_delete(cothread_t cothread);

    -Delete specified cothread.
    -Null (0) or invalid cothread handle is not allowed.
    -Passing handle of active cothread to this function is not allowed.
    -Passing handle of primary cothread is not allowed. -
    - -void co_switch(cothread_t cothread);

    -Switch to specified cothread.
    -Null (0) or invalid cothread handle is not allowed.
    -Passing handle of active cothread to this function is not allowed. -
    - - - diff --git a/src/lib/cothread/doc/x86.asm b/src/lib/cothread/doc/x86.asm deleted file mode 100644 index c55c25252dd..00000000000 --- a/src/lib/cothread/doc/x86.asm +++ /dev/null @@ -1,21 +0,0 @@ -; fastcall ABI: -; return = eax -; arguments = ecx,edx -; non-volatile registers = ebp,esi,edi,ebx - -co_swap_fastcall(to = ecx, from = edx): - mov [edx],esp - mov esp,[ecx] - pop eax - - mov [edx+ 4],ebp - mov [edx+ 8],esi - mov [edx+12],edi - mov [edx+16],ebx - - mov ebp,[ecx+ 4] - mov esi,[ecx+ 8] - mov edi,[ecx+12] - mov ebx,[ecx+16] - - jmp eax diff --git a/src/lib/cothread/fiber.c b/src/lib/cothread/fiber.c deleted file mode 100644 index 02ef5bc7881..00000000000 --- a/src/lib/cothread/fiber.c +++ /dev/null @@ -1,51 +0,0 @@ -/* - libco.win (2008-01-28) - authors: Nach, byuu - license: public domain -*/ - -#define LIBCO_C -#include "libco.h" -#define WINVER 0x0400 -#define _WIN32_WINNT 0x0400 -#define WIN32_LEAN_AND_MEAN -#include - -#ifdef __cplusplus -extern "C" { -#endif - -static thread_local cothread_t co_active_ = 0; - -static void __stdcall co_thunk(void *coentry) { - ((void (*)(void))coentry)(); -} - -cothread_t co_active() { - if(!co_active_) { - ConvertThreadToFiber(0); - co_active_ = GetCurrentFiber(); - } - return co_active_; -} - -cothread_t co_create(unsigned int heapsize, void (*coentry)(void)) { - if(!co_active_) { - ConvertThreadToFiber(0); - co_active_ = GetCurrentFiber(); - } - return (cothread_t)CreateFiber(heapsize, co_thunk, (void*)coentry); -} - -void co_delete(cothread_t cothread) { - DeleteFiber(cothread); -} - -void co_switch(cothread_t cothread) { - co_active_ = cothread; - SwitchToFiber(cothread); -} - -#ifdef __cplusplus -} -#endif diff --git a/src/lib/cothread/libco.c b/src/lib/cothread/libco.c deleted file mode 100644 index 5567626330d..00000000000 --- a/src/lib/cothread/libco.c +++ /dev/null @@ -1,23 +0,0 @@ -/* - libco - auto-selection module - license: public domain -*/ - -#if defined(__GNUC__) && defined(__i386__) - #include "x86.c" -#elif defined(__GNUC__) && defined(__amd64__) - #include "amd64.c" -#elif defined(__GNUC__) && defined(_ARCH_PPC) - #include "ppc.c" -#elif defined(__GNUC__) - #include "sjlj.c" -#elif defined(_MSC_VER) && defined(_M_IX86) - #include "x86.c" -#elif defined(_MSC_VER) && defined(_M_AMD64) - #include "amd64.c" -#elif defined(_MSC_VER) - #include "fiber.c" -#else - #error "libco: unsupported processor, compiler or operating system" -#endif diff --git a/src/lib/cothread/libco.h b/src/lib/cothread/libco.h deleted file mode 100644 index deb954fb4d6..00000000000 --- a/src/lib/cothread/libco.h +++ /dev/null @@ -1,34 +0,0 @@ -/* - libco - version: 0.16 (2010-12-24) - license: public domain -*/ - -#ifndef LIBCO_H -#define LIBCO_H - -#ifdef LIBCO_C - #ifdef LIBCO_MP - #define thread_local __thread - #else - #define thread_local - #endif -#endif - -#ifdef __cplusplus -extern "C" { -#endif - -typedef void* cothread_t; - -cothread_t co_active(); -cothread_t co_create(unsigned int, void (*)(void)); -void co_delete(cothread_t); -void co_switch(cothread_t); - -#ifdef __cplusplus -} -#endif - -/* ifndef LIBCO_H */ -#endif diff --git a/src/lib/cothread/ppc.c b/src/lib/cothread/ppc.c deleted file mode 100644 index 5640ad8d2cb..00000000000 --- a/src/lib/cothread/ppc.c +++ /dev/null @@ -1,411 +0,0 @@ -/* - libco.ppc (2010-10-17) - author: blargg - license: public domain -*/ - -/* PowerPC 32/64 using embedded or external asm, with optional -floating-point and AltiVec save/restore */ - -#define LIBCO_C -#include "libco.h" -#include -#include -#include - -#define LIBCO_MPROTECT (defined(__unix__) && !defined(LIBCO_PPC_ASM)) || defined(SDLMAME_MACOSX) - -#if LIBCO_MPROTECT - #include - #include -#endif - -/* State format (offsets in 32-bit words) - -+0 Pointer to swap code - Rest of function descriptor for entry function -+8 PC -+10 SP - Special regs - GPRs - FPRs - VRs - stack -*/ - -enum { state_size = 1024 }; -enum { above_stack = 2048 }; -enum { stack_align = 256 }; - -static thread_local cothread_t co_active_handle = 0; - -/**** Determine environment ****/ - -#define LIBCO_PPC64 defined(_ARCH_PPC64) || defined(__PPC64__) || defined(__ppc64__) || defined(__powerpc64__) - -/* Whether function calls are indirect through a descriptor, -or are directly to function */ -#ifndef LIBCO_PPCDESC -#ifdef SDLMAME_MACOSX - #define LIBCO_PPCDESC 0 -#else - #if !defined(_CALL_SYSV) && (defined(_CALL_AIX) || defined(_CALL_AIXDESC) || defined(LIBCO_PPC64)) - #define LIBCO_PPCDESC 1 - #endif -#endif -#endif - -#ifdef LIBCO_PPC_ASM - - #ifdef __cplusplus - extern "C" - #endif - - /* Swap code is in ppc.S */ - void co_swap_asm( cothread_t, cothread_t ); - #define CO_SWAP_ASM( x, y ) co_swap_asm( x, y ) - -#else - -/* Swap code is here in array. Please leave dieassembly comments, -as they make it easy to see what it does, and reorder instructions -if one wants to see whether that improves performance. */ -static const uint32_t libco_ppc_code [] = { -#if LIBCO_PPC64 - 0x7d000026, /* mfcr r8 */ - 0xf8240028, /* std r1,40(r4) */ - 0x7d2802a6, /* mflr r9 */ - 0xf9c40048, /* std r14,72(r4) */ - 0xf9e40050, /* std r15,80(r4) */ - 0xfa040058, /* std r16,88(r4) */ - 0xfa240060, /* std r17,96(r4) */ - 0xfa440068, /* std r18,104(r4) */ - 0xfa640070, /* std r19,112(r4) */ - 0xfa840078, /* std r20,120(r4) */ - 0xfaa40080, /* std r21,128(r4) */ - 0xfac40088, /* std r22,136(r4) */ - 0xfae40090, /* std r23,144(r4) */ - 0xfb040098, /* std r24,152(r4) */ - 0xfb2400a0, /* std r25,160(r4) */ - 0xfb4400a8, /* std r26,168(r4) */ - 0xfb6400b0, /* std r27,176(r4) */ - 0xfb8400b8, /* std r28,184(r4) */ - 0xfba400c0, /* std r29,192(r4) */ - 0xfbc400c8, /* std r30,200(r4) */ - 0xfbe400d0, /* std r31,208(r4) */ - 0xf9240020, /* std r9,32(r4) */ - 0xe8e30020, /* ld r7,32(r3) */ - 0xe8230028, /* ld r1,40(r3) */ - 0x48000009, /* bl 1 */ - 0x7fe00008, /* trap */ - 0x91040030,/*1:stw r8,48(r4) */ - 0x80c30030, /* lwz r6,48(r3) */ - 0x7ce903a6, /* mtctr r7 */ - 0xe9c30048, /* ld r14,72(r3) */ - 0xe9e30050, /* ld r15,80(r3) */ - 0xea030058, /* ld r16,88(r3) */ - 0xea230060, /* ld r17,96(r3) */ - 0xea430068, /* ld r18,104(r3) */ - 0xea630070, /* ld r19,112(r3) */ - 0xea830078, /* ld r20,120(r3) */ - 0xeaa30080, /* ld r21,128(r3) */ - 0xeac30088, /* ld r22,136(r3) */ - 0xeae30090, /* ld r23,144(r3) */ - 0xeb030098, /* ld r24,152(r3) */ - 0xeb2300a0, /* ld r25,160(r3) */ - 0xeb4300a8, /* ld r26,168(r3) */ - 0xeb6300b0, /* ld r27,176(r3) */ - 0xeb8300b8, /* ld r28,184(r3) */ - 0xeba300c0, /* ld r29,192(r3) */ - 0xebc300c8, /* ld r30,200(r3) */ - 0xebe300d0, /* ld r31,208(r3) */ - 0x7ccff120, /* mtcr r6 */ -#else - 0x7d000026, /* mfcr r8 */ - 0x90240028, /* stw r1,40(r4) */ - 0x7d2802a6, /* mflr r9 */ - 0x91a4003c, /* stw r13,60(r4) */ - 0x91c40040, /* stw r14,64(r4) */ - 0x91e40044, /* stw r15,68(r4) */ - 0x92040048, /* stw r16,72(r4) */ - 0x9224004c, /* stw r17,76(r4) */ - 0x92440050, /* stw r18,80(r4) */ - 0x92640054, /* stw r19,84(r4) */ - 0x92840058, /* stw r20,88(r4) */ - 0x92a4005c, /* stw r21,92(r4) */ - 0x92c40060, /* stw r22,96(r4) */ - 0x92e40064, /* stw r23,100(r4) */ - 0x93040068, /* stw r24,104(r4) */ - 0x9324006c, /* stw r25,108(r4) */ - 0x93440070, /* stw r26,112(r4) */ - 0x93640074, /* stw r27,116(r4) */ - 0x93840078, /* stw r28,120(r4) */ - 0x93a4007c, /* stw r29,124(r4) */ - 0x93c40080, /* stw r30,128(r4) */ - 0x93e40084, /* stw r31,132(r4) */ - 0x91240020, /* stw r9,32(r4) */ - 0x80e30020, /* lwz r7,32(r3) */ - 0x80230028, /* lwz r1,40(r3) */ - 0x48000009, /* bl 1 */ - 0x7fe00008, /* trap */ - 0x91040030,/*1:stw r8,48(r4) */ - 0x80c30030, /* lwz r6,48(r3) */ - 0x7ce903a6, /* mtctr r7 */ - 0x81a3003c, /* lwz r13,60(r3) */ - 0x81c30040, /* lwz r14,64(r3) */ - 0x81e30044, /* lwz r15,68(r3) */ - 0x82030048, /* lwz r16,72(r3) */ - 0x8223004c, /* lwz r17,76(r3) */ - 0x82430050, /* lwz r18,80(r3) */ - 0x82630054, /* lwz r19,84(r3) */ - 0x82830058, /* lwz r20,88(r3) */ - 0x82a3005c, /* lwz r21,92(r3) */ - 0x82c30060, /* lwz r22,96(r3) */ - 0x82e30064, /* lwz r23,100(r3) */ - 0x83030068, /* lwz r24,104(r3) */ - 0x8323006c, /* lwz r25,108(r3) */ - 0x83430070, /* lwz r26,112(r3) */ - 0x83630074, /* lwz r27,116(r3) */ - 0x83830078, /* lwz r28,120(r3) */ - 0x83a3007c, /* lwz r29,124(r3) */ - 0x83c30080, /* lwz r30,128(r3) */ - 0x83e30084, /* lwz r31,132(r3) */ - 0x7ccff120, /* mtcr r6 */ -#endif - -#ifndef LIBCO_PPC_NOFP - 0xd9c400e0, /* stfd f14,224(r4) */ - 0xd9e400e8, /* stfd f15,232(r4) */ - 0xda0400f0, /* stfd f16,240(r4) */ - 0xda2400f8, /* stfd f17,248(r4) */ - 0xda440100, /* stfd f18,256(r4) */ - 0xda640108, /* stfd f19,264(r4) */ - 0xda840110, /* stfd f20,272(r4) */ - 0xdaa40118, /* stfd f21,280(r4) */ - 0xdac40120, /* stfd f22,288(r4) */ - 0xdae40128, /* stfd f23,296(r4) */ - 0xdb040130, /* stfd f24,304(r4) */ - 0xdb240138, /* stfd f25,312(r4) */ - 0xdb440140, /* stfd f26,320(r4) */ - 0xdb640148, /* stfd f27,328(r4) */ - 0xdb840150, /* stfd f28,336(r4) */ - 0xdba40158, /* stfd f29,344(r4) */ - 0xdbc40160, /* stfd f30,352(r4) */ - 0xdbe40168, /* stfd f31,360(r4) */ - 0xc9c300e0, /* lfd f14,224(r3) */ - 0xc9e300e8, /* lfd f15,232(r3) */ - 0xca0300f0, /* lfd f16,240(r3) */ - 0xca2300f8, /* lfd f17,248(r3) */ - 0xca430100, /* lfd f18,256(r3) */ - 0xca630108, /* lfd f19,264(r3) */ - 0xca830110, /* lfd f20,272(r3) */ - 0xcaa30118, /* lfd f21,280(r3) */ - 0xcac30120, /* lfd f22,288(r3) */ - 0xcae30128, /* lfd f23,296(r3) */ - 0xcb030130, /* lfd f24,304(r3) */ - 0xcb230138, /* lfd f25,312(r3) */ - 0xcb430140, /* lfd f26,320(r3) */ - 0xcb630148, /* lfd f27,328(r3) */ - 0xcb830150, /* lfd f28,336(r3) */ - 0xcba30158, /* lfd f29,344(r3) */ - 0xcbc30160, /* lfd f30,352(r3) */ - 0xcbe30168, /* lfd f31,360(r3) */ -#endif - -#ifdef __ALTIVEC__ - 0x7ca042a6, /* mfvrsave r5 */ - 0x39040180, /* addi r8,r4,384 */ - 0x39240190, /* addi r9,r4,400 */ - 0x70a00fff, /* andi. r0,r5,4095 */ - 0x90a40034, /* stw r5,52(r4) */ - 0x4182005c, /* beq- 2 */ - 0x7e8041ce, /* stvx v20,r0,r8 */ - 0x39080020, /* addi r8,r8,32 */ - 0x7ea049ce, /* stvx v21,r0,r9 */ - 0x39290020, /* addi r9,r9,32 */ - 0x7ec041ce, /* stvx v22,r0,r8 */ - 0x39080020, /* addi r8,r8,32 */ - 0x7ee049ce, /* stvx v23,r0,r9 */ - 0x39290020, /* addi r9,r9,32 */ - 0x7f0041ce, /* stvx v24,r0,r8 */ - 0x39080020, /* addi r8,r8,32 */ - 0x7f2049ce, /* stvx v25,r0,r9 */ - 0x39290020, /* addi r9,r9,32 */ - 0x7f4041ce, /* stvx v26,r0,r8 */ - 0x39080020, /* addi r8,r8,32 */ - 0x7f6049ce, /* stvx v27,r0,r9 */ - 0x39290020, /* addi r9,r9,32 */ - 0x7f8041ce, /* stvx v28,r0,r8 */ - 0x39080020, /* addi r8,r8,32 */ - 0x7fa049ce, /* stvx v29,r0,r9 */ - 0x39290020, /* addi r9,r9,32 */ - 0x7fc041ce, /* stvx v30,r0,r8 */ - 0x7fe049ce, /* stvx v31,r0,r9 */ - 0x80a30034,/*2:lwz r5,52(r3) */ - 0x39030180, /* addi r8,r3,384 */ - 0x39230190, /* addi r9,r3,400 */ - 0x70a00fff, /* andi. r0,r5,4095 */ - 0x7ca043a6, /* mtvrsave r5 */ - 0x4d820420, /* beqctr */ - 0x7e8040ce, /* lvx v20,r0,r8 */ - 0x39080020, /* addi r8,r8,32 */ - 0x7ea048ce, /* lvx v21,r0,r9 */ - 0x39290020, /* addi r9,r9,32 */ - 0x7ec040ce, /* lvx v22,r0,r8 */ - 0x39080020, /* addi r8,r8,32 */ - 0x7ee048ce, /* lvx v23,r0,r9 */ - 0x39290020, /* addi r9,r9,32 */ - 0x7f0040ce, /* lvx v24,r0,r8 */ - 0x39080020, /* addi r8,r8,32 */ - 0x7f2048ce, /* lvx v25,r0,r9 */ - 0x39290020, /* addi r9,r9,32 */ - 0x7f4040ce, /* lvx v26,r0,r8 */ - 0x39080020, /* addi r8,r8,32 */ - 0x7f6048ce, /* lvx v27,r0,r9 */ - 0x39290020, /* addi r9,r9,32 */ - 0x7f8040ce, /* lvx v28,r0,r8 */ - 0x39080020, /* addi r8,r8,32 */ - 0x7fa048ce, /* lvx v29,r0,r9 */ - 0x39290020, /* addi r9,r9,32 */ - 0x7fc040ce, /* lvx v30,r0,r8 */ - 0x7fe048ce, /* lvx v31,r0,r9 */ -#endif - - 0x4e800420, /* bctr */ -}; - - #if LIBCO_PPCDESC - /* Function call goes through indirect descriptor */ - #define CO_SWAP_ASM( x, y ) \ - ((void (*)( cothread_t, cothread_t )) (uintptr_t) x)( x, y ) - #else - /* Function call goes directly to code */ - #define CO_SWAP_ASM( x, y ) \ - ((void (*)( cothread_t, cothread_t )) (uintptr_t) libco_ppc_code)( x, y ) - #endif - -#endif - -static uint32_t* co_create_( unsigned size, uintptr_t entry ) -{ - uint32_t* t = (uint32_t*) malloc( size ); - - (void) entry; - - #if LIBCO_PPCDESC - if ( t ) - { - /* Copy entry's descriptor */ - memcpy( t, (void*) entry, sizeof (void*) * 3 ); - - /* Set function pointer to swap routine */ - #ifdef LIBCO_PPC_ASM - *(const void**) t = *(void**) &co_swap_asm; - #else - *(const void**) t = libco_ppc_code; - #endif - } - #endif - - return t; -} - -cothread_t co_create( unsigned int size, void (*entry_)( void ) ) -{ - uintptr_t entry = (uintptr_t) entry_; - uint32_t* t = NULL; - - /* Be sure main thread was successfully allocated */ - if ( co_active() ) - { - size += state_size + above_stack + stack_align; - t = co_create_( size, entry ); - } - - if ( t ) - { - uintptr_t sp; - int shift; - - /* Save current registers into new thread, so that any special ones will - have proper values when thread is begun */ - CO_SWAP_ASM( t, t ); - - #if LIBCO_PPCDESC - /* Get real address */ - entry = (uintptr_t) *(void**) entry; - #endif - - /* Put stack near end of block, and align */ - sp = (uintptr_t) t + size - above_stack; - sp -= sp % stack_align; - - /* On PPC32, we save and restore GPRs as 32 bits. For PPC64, we - save and restore them as 64 bits, regardless of the size the ABI - uses. So, we manually write pointers at the proper size. We always - save and restore at the same address, and since PPC is big-endian, - we must put the low byte first on PPC32. */ - - /* If uintptr_t is 32 bits, >>32 is undefined behavior, so we do two shifts - and don't have to care how many bits uintptr_t is. */ - #if LIBCO_PPC64 - shift = 16; - #else - shift = 0; - #endif - - /* Set up so entry will be called on next swap */ - t [8] = (uint32_t) (entry >> shift >> shift); - t [9] = (uint32_t) entry; - - t [10] = (uint32_t) (sp >> shift >> shift); - t [11] = (uint32_t) sp; - } - - return t; -} - -void co_delete( cothread_t t ) -{ - free( t ); -} - -static void co_init_( void ) -{ - #if LIBCO_MPROTECT - /* TODO: pre- and post-pad PPC code so that this doesn't make other - data executable and writable */ - long page_size = sysconf( _SC_PAGESIZE ); - if ( page_size > 0 ) - { - uintptr_t align = page_size; - uintptr_t begin = (uintptr_t) libco_ppc_code; - uintptr_t end = begin + sizeof libco_ppc_code; - - /* Align beginning and end */ - end += align - 1; - end -= end % align; - begin -= begin % align; - - mprotect( (void*) begin, end - begin, PROT_READ | PROT_WRITE | PROT_EXEC ); - } - #endif - - co_active_handle = co_create_( state_size, (uintptr_t) &co_switch ); -} - -cothread_t co_active() -{ - if ( !co_active_handle ) - co_init_(); - - return co_active_handle; -} - -void co_switch( cothread_t t ) -{ - cothread_t old = co_active_handle; - co_active_handle = t; - - CO_SWAP_ASM( t, old ); -} diff --git a/src/lib/cothread/sjlj.c b/src/lib/cothread/sjlj.c deleted file mode 100644 index 8b72b614e38..00000000000 --- a/src/lib/cothread/sjlj.c +++ /dev/null @@ -1,102 +0,0 @@ -/* - libco.sjlj (2008-01-28) - author: Nach - license: public domain -*/ - -/* - * Note this was designed for UNIX systems. Based on ideas expressed in a paper - * by Ralf Engelschall. - * For SJLJ on other systems, one would want to rewrite springboard() and - * co_create() and hack the jmb_buf stack pointer. - */ - -#define LIBCO_C -#include "libco.h" -#include -#include -#include - -#ifdef __cplusplus -extern "C" { -#endif - -typedef struct { - sigjmp_buf context; - void (*coentry)(void); - void *stack; -} cothread_struct; - -static thread_local cothread_struct co_primary; -static thread_local cothread_struct *creating, *co_running = 0; - -static void springboard(int ignored) { - if(sigsetjmp(creating->context, 0)) { - co_running->coentry(); - } -} - -cothread_t co_active() { - if(!co_running) co_running = &co_primary; - return (cothread_t)co_running; -} - -cothread_t co_create(unsigned int size, void (*coentry)(void)) { - if(!co_running) co_running = &co_primary; - - cothread_struct *thread = (cothread_struct*)malloc(sizeof(cothread_struct)); - if(thread) { - struct sigaction handler; - struct sigaction old_handler; - - stack_t stack; - stack_t old_stack; - - thread->coentry = thread->stack = 0; - - stack.ss_flags = 0; - stack.ss_size = size; - thread->stack = stack.ss_sp = malloc(size); - if(stack.ss_sp && !sigaltstack(&stack, &old_stack)) { - handler.sa_handler = springboard; - handler.sa_flags = SA_ONSTACK; - sigemptyset(&handler.sa_mask); - creating = thread; - - if(!sigaction(SIGUSR1, &handler, &old_handler)) { - if(!raise(SIGUSR1)) { - thread->coentry = coentry; - } - sigaltstack(&old_stack, 0); - sigaction(SIGUSR1, &old_handler, 0); - } - } - - if(thread->coentry != coentry) { - co_delete(thread); - thread = 0; - } - } - - return (cothread_t)thread; -} - -void co_delete(cothread_t cothread) { - if(cothread) { - if(((cothread_struct*)cothread)->stack) { - free(((cothread_struct*)cothread)->stack); - } - free(cothread); - } -} - -void co_switch(cothread_t cothread) { - if(!sigsetjmp(co_running->context, 0)) { - co_running = (cothread_struct*)cothread; - siglongjmp(co_running->context, 1); - } -} - -#ifdef __cplusplus -} -#endif diff --git a/src/lib/cothread/test/cc.bat b/src/lib/cothread/test/cc.bat deleted file mode 100644 index d436d6f2949..00000000000 --- a/src/lib/cothread/test/cc.bat +++ /dev/null @@ -1,4 +0,0 @@ -mingw32-gcc -O3 -fomit-frame-pointer -o libco.o -c ../libco.c -mingw32-g++ -O3 -fomit-frame-pointer -c test_timing.cpp -mingw32-g++ -O3 -fomit-frame-pointer test_timing.o libco.o -o test_timing.exe -@del *.o diff --git a/src/lib/cothread/test/cc.sh b/src/lib/cothread/test/cc.sh deleted file mode 100644 index c0e7846264f..00000000000 --- a/src/lib/cothread/test/cc.sh +++ /dev/null @@ -1,5 +0,0 @@ -clear -g++ -O3 -fomit-frame-pointer -c test_timing.cpp -gcc -O3 -fomit-frame-pointer -o libco.o -c ../libco.c -g++ -O3 -fomit-frame-pointer test_timing.o libco.o -o test_timing -rm -f *.o diff --git a/src/lib/cothread/test/test.h b/src/lib/cothread/test/test.h deleted file mode 100644 index 9d111c306b4..00000000000 --- a/src/lib/cothread/test/test.h +++ /dev/null @@ -1,6 +0,0 @@ -#include -#include -#include -#include - -#include "../libco.h" diff --git a/src/lib/cothread/test/test_args.cpp b/src/lib/cothread/test/test_args.cpp deleted file mode 100644 index 1e6e2bbb5a3..00000000000 --- a/src/lib/cothread/test/test_args.cpp +++ /dev/null @@ -1,76 +0,0 @@ -/***** - * cothread parameterized function example - ***** - * entry point to cothreads cannot take arguments. - * this is due to portability issues: each processor, - * operating system, programming language and compiler - * can use different parameter passing methods, so - * arguments to the cothread entry points were omitted. - * - * however, the behavior can easily be simulated by use - * of a specialized co_switch to set global parameters to - * be used as function arguments. - * - * in this way, with a bit of extra red tape, one gains - * even more flexibility than would be possible with a - * fixed argument list entry point, such as void (*)(void*), - * as any number of arguments can be used. - * - * this also eliminates race conditions where a pointer - * passed to co_create may have changed or become invalidated - * before call to co_switch, as said pointer would now be set - * when calling co_switch, instead. - *****/ - -#include "test.h" - -cothread_t thread[3]; - -namespace co_arg { - int param_x; - int param_y; -}; - -//one could also call this co_init or somesuch if they preferred ... -void co_switch(cothread_t thread, int param_x, int param_y) { - co_arg::param_x = param_x; - co_arg::param_y = param_y; - co_switch(thread); -} - -void co_entrypoint() { -int param_x = co_arg::param_x; -int param_y = co_arg::param_y; - printf("co_entrypoint(%d, %d)\n", param_x, param_y); - co_switch(thread[0]); - -//co_arg::param_x will change here (due to co_switch(cothread_t, int, int) call changing values), -//however, param_x and param_y will persist as they are thread local - - printf("co_entrypoint(%d, %d)\n", param_x, param_y); - co_switch(thread[0]); - throw; -} - -int main() { - printf("cothread parameterized function example\n\n"); - - thread[0] = co_active(); - thread[1] = co_create(65536, co_entrypoint); - thread[2] = co_create(65536, co_entrypoint); - -//use specialized co_switch(cothread_t, int, int) for initial co_switch call - co_switch(thread[1], 1, 2); - co_switch(thread[2], 4, 8); - -//after first call, entry point arguments have been initialized, standard -//co_switch(cothread_t) can be used from now on - co_switch(thread[2]); - co_switch(thread[1]); - - printf("\ndone\n"); -#if defined(_MSC_VER) || defined(__DJGPP__) - getch(); -#endif - return 0; -} diff --git a/src/lib/cothread/test/test_timing.cpp b/src/lib/cothread/test/test_timing.cpp deleted file mode 100644 index 0232e47e0d6..00000000000 --- a/src/lib/cothread/test/test_timing.cpp +++ /dev/null @@ -1,52 +0,0 @@ -#include "test.h" -enum { Iterations = 500000000 }; - -namespace thread { - cothread_t x; - cothread_t y; - volatile int counter; -} - -void co_timingtest() { - for(;;) { - thread::counter++; - co_switch(thread::x); - } -} - -void sub_timingtest() { - thread::counter++; -} - -int main() { - printf("context-switching timing test\n\n"); - time_t start, end; - int i, t1, t2; - - start = clock(); - for(thread::counter = 0, i = 0; i < Iterations; i++) { - sub_timingtest(); - } - end = clock(); - - t1 = (int)difftime(end, start); - printf("%2.3f seconds per 50 million subroutine calls (%d iterations)\n", (float)t1 / CLOCKS_PER_SEC, thread::counter); - - thread::x = co_active(); - thread::y = co_create(65536, co_timingtest); - - start = clock(); - for(thread::counter = 0, i = 0; i < Iterations; i++) { - co_switch(thread::y); - } - end = clock(); - - co_delete(thread::y); - - t2 = (int)difftime(end, start); - printf("%2.3f seconds per 100 million co_switch calls (%d iterations)\n", (float)t2 / CLOCKS_PER_SEC, thread::counter); - - printf("co_switch skew = %fx\n\n", (double)t2 / (double)t1); - return 0; -} - diff --git a/src/lib/cothread/ucontext.c b/src/lib/cothread/ucontext.c deleted file mode 100644 index 17472f6bccf..00000000000 --- a/src/lib/cothread/ucontext.c +++ /dev/null @@ -1,67 +0,0 @@ -/* - libco.ucontext (2008-01-28) - author: Nach - license: public domain -*/ - -/* - * WARNING: the overhead of POSIX ucontext is very high, - * assembly versions of libco or libco_sjlj should be much faster - * - * This library only exists for two reasons: - * 1 - as an initial test for the viability of a ucontext implementation - * 2 - to demonstrate the power and speed of libco over existing implementations, - * such as pth (which defaults to wrapping ucontext on unix targets) - * - * Use this library only as a *last resort* - */ - -#define LIBCO_C -#include "libco.h" -#include -#include - -#ifdef __cplusplus -extern "C" { -#endif - -static thread_local ucontext_t co_primary; -static thread_local ucontext_t *co_running = 0; - -cothread_t co_active() { - if(!co_running) co_running = &co_primary; - return (cothread_t)co_running; -} - -cothread_t co_create(unsigned int heapsize, void (*coentry)(void)) { - if(!co_running) co_running = &co_primary; - ucontext_t *thread = (ucontext_t*)malloc(sizeof(ucontext_t)); - if(thread) { - if((!getcontext(thread) && !(thread->uc_stack.ss_sp = 0)) && (thread->uc_stack.ss_sp = malloc(heapsize))) { - thread->uc_link = co_running; - thread->uc_stack.ss_size = heapsize; - makecontext(thread, coentry, 0); - } else { - co_delete((cothread_t)thread); - thread = 0; - } - } - return (cothread_t)thread; -} - -void co_delete(cothread_t cothread) { - if(cothread) { - if(((ucontext_t*)cothread)->uc_stack.ss_sp) { free(((ucontext_t*)cothread)->uc_stack.ss_sp); } - free(cothread); - } -} - -void co_switch(cothread_t cothread) { - ucontext_t *old_thread = co_running; - co_running = (ucontext_t*)cothread; - swapcontext(old_thread, co_running); -} - -#ifdef __cplusplus -} -#endif diff --git a/src/lib/cothread/x86.c b/src/lib/cothread/x86.c deleted file mode 100644 index b4d58f8bb8b..00000000000 --- a/src/lib/cothread/x86.c +++ /dev/null @@ -1,100 +0,0 @@ -/* - libco.x86 (2009-10-12) - author: byuu - license: public domain -*/ - -#define LIBCO_C -#include "libco.h" -#include -#include - -#ifdef __cplusplus -extern "C" { -#endif - -#if defined(_MSC_VER) - #define fastcall __fastcall -#elif defined(__GNUC__) - #define fastcall __attribute__((fastcall)) -#else - #error "libco: please define fastcall macro" -#endif - -static thread_local long co_active_buffer[64]; -static thread_local cothread_t co_active_handle = 0; -static void (fastcall *co_swap)(cothread_t, cothread_t) = 0; - -//ABI: fastcall -static unsigned char co_swap_function[] = { - 0x89, 0x22, 0x8B, 0x21, 0x58, 0x89, 0x6A, 0x04, 0x89, 0x72, 0x08, 0x89, 0x7A, 0x0C, 0x89, 0x5A, - 0x10, 0x8B, 0x69, 0x04, 0x8B, 0x71, 0x08, 0x8B, 0x79, 0x0C, 0x8B, 0x59, 0x10, 0xFF, 0xE0, -}; - -#ifdef _WIN32 - #include - - void co_init() { - DWORD old_privileges; - VirtualProtect(co_swap_function, sizeof co_swap_function, PAGE_EXECUTE_READWRITE, &old_privileges); - } -#elif defined(__OS2__) - #define INCL_DOS - #include - - void co_init() { - DosSetMem(co_swap_function, sizeof co_swap_function, PAG_READ | PAG_WRITE | PAG_EXECUTE); - } -#else - #include - #include - - void co_init() { - unsigned long addr = (unsigned long)co_swap_function; - unsigned long base = addr - (addr % sysconf(_SC_PAGESIZE)); - unsigned long size = (addr - base) + sizeof co_swap_function; - mprotect((void*)base, size, PROT_READ | PROT_WRITE | PROT_EXEC); - } -#endif - -static void crash() { - assert(0); /* called only if cothread_t entrypoint returns */ -} - -cothread_t co_active() { - if(!co_active_handle) co_active_handle = &co_active_buffer; - return co_active_handle; -} - -cothread_t co_create(unsigned int size, void (*entrypoint)(void)) { - cothread_t handle; - if(!co_swap) { - co_init(); - co_swap = (void (fastcall*)(cothread_t, cothread_t))co_swap_function; - } - if(!co_active_handle) co_active_handle = &co_active_buffer; - size += 256; /* allocate additional space for storage */ - size &= ~15; /* align stack to 16-byte boundary */ - - if((handle = (cothread_t)malloc(size))) { - long *p = (long*)((char*)handle + size); /* seek to top of stack */ - *--p = (long)crash; /* crash if entrypoint returns */ - *--p = (long)entrypoint; /* start of function */ - *(long*)handle = (long)p; /* stack pointer */ - } - - return handle; -} - -void co_delete(cothread_t handle) { - free(handle); -} - -void co_switch(cothread_t handle) { - register cothread_t co_previous_handle = co_active_handle; - co_swap(co_active_handle = handle, co_previous_handle); -} - -#ifdef __cplusplus -} -#endif