Skip to content

Commit

Permalink
Add __sh__ cpu arch support
Browse files Browse the repository at this point in the history
  • Loading branch information
Schischu committed Jun 20, 2012
1 parent ac77611 commit 37777e4
Show file tree
Hide file tree
Showing 13 changed files with 116 additions and 20 deletions.
2 changes: 1 addition & 1 deletion Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -310,7 +310,7 @@ ifeq (@USE_ASAP_CODEC@,1)
endif
endif
$(MAKE) -C lib/stsound/StSoundLibrary
ifeq ($(or $(findstring powerpc,@ARCH@),$(findstring x86_64-linux,@ARCH@),$(findstring arm, @ARCH@),$(findstring freebsd,@ARCH@)),)
ifeq ($(or $(findstring powerpc,@ARCH@),$(findstring x86_64-linux,@ARCH@),$(findstring arm, @ARCH@),$(findstring freebsd,@ARCH@),$(findstring sh, @ARCH@)),)
$(MAKE) -C lib/snesapu/SNES/SNESAPU
endif
imagelib: dllloader
Expand Down
6 changes: 6 additions & 0 deletions configure.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -561,6 +561,12 @@ case $host in
use_arch="arm"
AC_SUBST(ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_LINUX -D_LINUX")
;;
sh*-*-linux-gnu*)
use_texturepacker=no
ARCH="sh"
use_arch="sh"
AC_SUBST(ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_LINUX -D_LINUX")
;;
*)
AC_MSG_ERROR(unsupported host ($host))
esac
Expand Down
2 changes: 1 addition & 1 deletion xbmc/cores/DllLoader/DllLoader.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
#include "coffldr.h"
#include "LibraryLoader.h"

#if defined(__linux__) && !defined(__powerpc__) && !defined(__arm__)
#if defined(__linux__) && !defined(__powerpc__) && !defined(__arm__) && !defined(__sh__)
#define USE_LDT_KEEPER
#include "ldt_keeper.h"
#endif
Expand Down
2 changes: 1 addition & 1 deletion xbmc/cores/DllLoader/ldt_keeper.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
*/

//#ifndef __powerpc__
#if !defined(__powerpc__) && !defined(__ppc__) && !defined(__arm__)
#if !defined(__powerpc__) && !defined(__ppc__) && !defined(__arm__) && !defined(__sh__)

#include "ldt_keeper.h"

Expand Down
2 changes: 1 addition & 1 deletion xbmc/linux/PlatformDefs.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@
#define __int64 long long
#define __uint64 unsigned long long

#if defined(__x86_64__) || defined(__powerpc__) || defined(__ppc__) || defined (__arm__) // should this be powerpc64 only?
#if defined(__x86_64__) || defined(__powerpc__) || defined(__ppc__) || defined (__arm__) || defined (__sh__) // should this be powerpc64 only?
#define __stdcall
#else /* !__x86_64__ */
#define __stdcall __attribute__((__stdcall__))
Expand Down
82 changes: 81 additions & 1 deletion xbmc/threads/Atomics.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,25 @@ long cas(volatile long* pAddr, long expectedVal, long swapVal)
#elif defined(__mips__)
// TODO:

#elif defined(__sh__)
long cas(volatile long* pAddr, long expectedVal, long swapVal)
{
unsigned int prev;

__asm__ __volatile__ (
" .align 2 \n"
" mov.l @%2, %0 \n" /* Load the current value of *pAddr(%2) into prev (%0) */
" cmp/eq %0, %3 \n" /* Verify that the current value (%2) == old value (%3) */
" bf 2f \n" /* Bail if the two values are not equal [not as expected] */
" mov.l %4, @%2 \n" /* Attempt to store swapVal (%4) value into *pAddr (%2) [p must still be reserved] */
"2: \n"
: "=&r" (prev), "+m" (*pAddr) /* Outputs [prev, *pAddr] */
: "r" (pAddr), "r" (expectedVal), "r" (swapVal) /* Inputs [pAddr, expectedVal, swapVal] */
);

return prev;
}

#elif defined(WIN32)

long cas(volatile long* pAddr, long expectedVal, long swapVal)
Expand Down Expand Up @@ -115,7 +134,7 @@ long cas(volatile long* pAddr,long expectedVal, long swapVal)
// 64-bit atomic compare-and-swap
// Returns previous value of *pAddr
///////////////////////////////////////////////////////////////////////////
#if defined(__ppc__) || defined(__powerpc__) || defined(__arm__) || defined(__mips__) // PowerPC, ARM, and MIPS
#if defined(__ppc__) || defined(__powerpc__) || defined(__arm__) || defined(__mips__) || defined(__sh__) // PowerPC, ARM, MIPS and SH

// Not available/required

Expand Down Expand Up @@ -212,6 +231,21 @@ long AtomicIncrement(volatile long* pAddr)
#elif defined(__mips__)
// TODO:

#elif defined(__sh__)
long AtomicIncrement(volatile long* pAddr)
{
register long val;
__asm__ __volatile__ (
" .align 2 \n"
" mov.l @%1, %0 \n" //Move the first value to val
" add #1, %0 \n" //Increase val by 1
" mov.l %0, @%1 \n" //Move val to the first value
: "=&r" (val)
: "r" (pAddr)
);
return val;
}

#elif defined(WIN32)

long AtomicIncrement(volatile long* pAddr)
Expand Down Expand Up @@ -291,6 +325,21 @@ long AtomicAdd(volatile long* pAddr, long amount)
#elif defined(__mips__)
// TODO:

#elif defined(__sh__)
long AtomicAdd(volatile long* pAddr, long amount)
{
register long val;
__asm__ __volatile__ (
" .align 2 \n"
" mov.l @%1, %0 \n"
" add %2, %0 \n"
" mov.l %0, @%1 \n"
: "=&r" (val)
: "r" (pAddr), "r" (amount)
);
return val;
}

#elif defined(WIN32)

long AtomicAdd(volatile long* pAddr, long amount)
Expand Down Expand Up @@ -370,6 +419,21 @@ long AtomicDecrement(volatile long* pAddr)
#elif defined(__mips__)
// TODO:

#elif defined(__sh__)
long AtomicDecrement(volatile long* pAddr)
{
register long val;
__asm__ __volatile__ (
" .align 2 \n"
" mov.l @%1, %0 \n"
" add #-1, %0 \n"
" mov.l %0, @%1 \n"
: "=&r" (val)
: "r" (pAddr)
);
return val;
}

#elif defined(WIN32)

long AtomicDecrement(volatile long* pAddr)
Expand Down Expand Up @@ -450,6 +514,22 @@ long AtomicSubtract(volatile long* pAddr, long amount)
#elif defined(__mips__)
// TODO:

#elif defined(__sh__)
long AtomicSubtract(volatile long* pAddr, long amount)
{
register long val;
amount *= -1;
__asm__ __volatile__ (
" .align 2 \n"
" mov.l @%1, %0 \n"
" add %2, %0 \n"
" mov.l %0, @%1 \n"
: "=&r" (val)
: "r" (pAddr), "r" (amount)
);
return val;
}

#elif defined(WIN32)

long AtomicSubtract(volatile long* pAddr, long amount)
Expand Down
2 changes: 1 addition & 1 deletion xbmc/threads/Atomics.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

// TODO: Inline these methods
long cas(volatile long *pAddr, long expectedVal, long swapVal);
#if !defined(__ppc__) && !defined(__powerpc__) && !defined(__arm__)
#if !defined(__ppc__) && !defined(__powerpc__) && !defined(__arm__) && !defined(__sh__)
long long cas2(volatile long long* pAddr, long long expectedVal, long long swapVal);
#endif
long AtomicIncrement(volatile long* pAddr);
Expand Down
18 changes: 9 additions & 9 deletions xbmc/threads/LockFree.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ void lf_stack_push(lf_stack* pStack, lf_node* pNode)
top = pStack->top;
pNode->next.ptr = top.ptr; // Link in the new node
newTop.ptr = pNode;
#if defined(__ppc__) || defined(__powerpc__) || defined(__arm__)
#if defined(__ppc__) || defined(__powerpc__) || defined(__arm__) || defined(__sh__)
} while(cas((long*)&pStack->top, atomic_ptr_to_long(top), atomic_ptr_to_long(newTop)) != atomic_ptr_to_long(top));
#else
newTop.version = top.version + 1;
Expand All @@ -62,7 +62,7 @@ lf_node* lf_stack_pop(lf_stack* pStack)
if (top.ptr == NULL)
return NULL;
newTop.ptr = ((lf_node*)top.ptr)->next.ptr; // Unlink the current top node
#if defined(__ppc__) || defined(__powerpc__) || defined(__arm__)
#if defined(__ppc__) || defined(__powerpc__) || defined(__arm__) || defined(__sh__)
} while(cas((long*)&pStack->top, atomic_ptr_to_long(top), atomic_ptr_to_long(newTop)) != atomic_ptr_to_long(top));
#else
newTop.version = top.version + 1;
Expand Down Expand Up @@ -187,7 +187,7 @@ void lf_queue_enqueue(lf_queue* pQueue, void* value)
{
tail = pQueue->tail;
next = ((lf_queue_node*)tail.ptr)->next;
#if defined(__ppc__) || defined(__powerpc__) || defined(__arm__)
#if defined(__ppc__) || defined(__powerpc__) || defined(__arm__) || defined(__sh__)
if (atomic_ptr_to_long(tail) == atomic_ptr_to_long(pQueue->tail)) // Check consistency
#else
if (atomic_ptr_to_long_long(tail) == atomic_ptr_to_long_long(pQueue->tail)) // Check consistency
Expand All @@ -196,7 +196,7 @@ void lf_queue_enqueue(lf_queue* pQueue, void* value)
if (next.ptr == NULL) // Was tail pointing to the last node?
{
node.ptr = pNode;
#if defined(__ppc__) || defined(__powerpc__) || defined(__arm__)
#if defined(__ppc__) || defined(__powerpc__) || defined(__arm__) || defined(__sh__)
if (cas((long*)&((lf_queue_node*)tail.ptr)->next, atomic_ptr_to_long(next), atomic_ptr_to_long(node)) == atomic_ptr_to_long(next)) // Try to link node at end
#else
node.version = next.version + 1;
Expand All @@ -207,7 +207,7 @@ void lf_queue_enqueue(lf_queue* pQueue, void* value)
else // tail was lagging, try to help...
{
node.ptr = next.ptr;
#if defined(__ppc__) || defined(__powerpc__) || defined(__arm__)
#if defined(__ppc__) || defined(__powerpc__) || defined(__arm__) || defined(__sh__)
cas((long*)&pQueue->tail, atomic_ptr_to_long(tail), atomic_ptr_to_long(node)); // We don't care if we are successful or not
#else
node.version = tail.version + 1;
Expand All @@ -217,7 +217,7 @@ void lf_queue_enqueue(lf_queue* pQueue, void* value)
}
} while (true); // Keep trying until the enqueue is done
node.ptr = pNode;
#if defined(__ppc__) || defined(__powerpc__) || defined(__arm__)
#if defined(__ppc__) || defined(__powerpc__) || defined(__arm__) || defined(__sh__)
cas((long*)&pQueue->tail, atomic_ptr_to_long(tail), atomic_ptr_to_long(node)); // Try to swing the tail to the new node
#else
node.version = tail.version + 1;
Expand All @@ -236,7 +236,7 @@ void* lf_queue_dequeue(lf_queue* pQueue)
head = pQueue->head;
tail = pQueue->tail;
next = ((lf_queue_node*)head.ptr)->next;
#if defined(__ppc__) || defined(__powerpc__) || defined(__arm__)
#if defined(__ppc__) || defined(__powerpc__) || defined(__arm__) || defined(__sh__)
if (atomic_ptr_to_long(head) == atomic_ptr_to_long(pQueue->head)) // Check consistency
#else
if (atomic_ptr_to_long_long(head) == atomic_ptr_to_long_long(pQueue->head)) // Check consistency
Expand All @@ -247,7 +247,7 @@ void* lf_queue_dequeue(lf_queue* pQueue)
if (next.ptr == NULL) // Queue is empty
return NULL;
node.ptr = next.ptr;
#if defined(__ppc__) || defined(__powerpc__) || defined(__arm__)
#if defined(__ppc__) || defined(__powerpc__) || defined(__arm__) || defined(__sh__)
cas((long*)&pQueue->tail, atomic_ptr_to_long(tail), atomic_ptr_to_long(node)); // Tail is lagging. Try to advance it.
#else
node.version = tail.version + 1;
Expand All @@ -258,7 +258,7 @@ void* lf_queue_dequeue(lf_queue* pQueue)
{
pVal = ((lf_queue_node*)next.ptr)->value;
node.ptr = next.ptr;
#if defined(__ppc__) || defined(__powerpc__) || defined(__arm__)
#if defined(__ppc__) || defined(__powerpc__) || defined(__arm__) || defined(__sh__)
if (cas((long*)&pQueue->head, atomic_ptr_to_long(head), atomic_ptr_to_long(node)) == atomic_ptr_to_long(head))
#else
node.version = head.version + 1;
Expand Down
4 changes: 2 additions & 2 deletions xbmc/threads/LockFree.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
// A unique-valued pointer. Version is incremented with each write.
union atomic_ptr
{
#if !defined(__ppc__) && !defined(__powerpc__) && !defined(__arm__)
#if !defined(__ppc__) && !defined(__powerpc__) && !defined(__arm__) && !defined(__sh__)
long long d;
struct {
void* ptr;
Expand All @@ -45,7 +45,7 @@ union atomic_ptr
#endif
};

#if defined(__ppc__) || defined(__powerpc__) || defined(__arm__)
#if defined(__ppc__) || defined(__powerpc__) || defined(__arm__) || defined(__sh__)
#define atomic_ptr_to_long(p) (long) *((long*)&p)
#else
// This is ugly but correct as long as sizeof(void*) == sizeof(long)...
Expand Down
10 changes: 9 additions & 1 deletion xbmc/utils/CPUInfo.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,11 @@ CCPUInfo::CCPUInfo(void)
m_cores[nCurrId].m_strVendor.Trim();
}
}
#if defined(__sh__)
else if (strncmp(buffer, "cpu type", strlen("cpu type"))==0)
#else
else if (strncmp(buffer, "model name", strlen("model name"))==0)
#endif
{
char *needle = strstr(buffer, ":");
if (needle && strlen(needle)>3)
Expand Down Expand Up @@ -337,7 +341,11 @@ float CCPUInfo::getCPUFrequency()
rewind(m_fCPUInfo);
fflush(m_fCPUInfo);
while (fgets(buf, 256, m_fCPUInfo) != NULL) {
#if defined(__sh__)
if (strncmp(buf, "bogomips", 8) == 0) {
#else
if (strncmp(buf, "cpu MHz", 7) == 0) {
#endif
needle = strchr(buf, ':');
sscanf(++needle, "%f", &mhz);
break;
Expand Down Expand Up @@ -597,7 +605,7 @@ void CCPUInfo::ReadCPUFeatures()
#endif
#elif defined(LINUX)
// empty on purpose, the implementation is in the constructor
#elif !defined(__powerpc__) && !defined(__ppc__) && !defined(__arm__)
#elif !defined(__powerpc__) && !defined(__ppc__) && !defined(__arm__) && !defined(__sh__)
m_cpuFeatures |= CPU_FEATURE_MMX;
#elif defined(__powerpc__) || defined(__ppc__)
m_cpuFeatures |= CPU_FEATURE_ALTIVEC;
Expand Down
2 changes: 2 additions & 0 deletions xbmc/utils/MathUtils.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,14 @@

#if defined(__ppc__) || \
defined(__powerpc__) || \
defined(__sh__) || \
(defined(__APPLE__) && defined(__arm__) && defined(__llvm__))
#define DISABLE_MATHUTILS_ASM_ROUND_INT
#endif

#if defined(__ppc__) || \
defined(__powerpc__) || \
defined(__sh__) || \
(defined(__APPLE__) && defined(__llvm__))
#define DISABLE_MATHUTILS_ASM_TRUNCATE_INT
#endif
Expand Down
2 changes: 1 addition & 1 deletion xbmc/utils/fastmemcpy.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
#if !defined(_WIN32) && !defined(__ppc__) && !defined(__powerpc__) && !defined(__arm__)
#if !defined(_WIN32) && !defined(__ppc__) && !defined(__powerpc__) && !defined(__arm__) && !defined(__sh__)
#define HAVE_MMX2
#define HAVE_SSE

Expand Down
2 changes: 1 addition & 1 deletion xbmc/utils/fastmemcpy.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
extern "C" {
#endif

#if !defined(_WIN32) && !defined(__ppc__) && !defined(__powerpc__)
#if !defined(_WIN32) && !defined(__ppc__) && !defined(__powerpc__) && !defined(__sh__)
void * fast_memcpy(void * to, const void * from, size_t len);
//#define fast_memcpy memcpy
#else
Expand Down

1 comment on commit 37777e4

@davilla
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks fine, will get merged in next merge window.

Please sign in to comment.