Menu
▾
▴
[cadcdev-svn-commits] [SCM] branch master updated. v2.0.0-15-g3294e0a
|
From: Lawrence S. <ljs...@us...> - 2013-06-07 05:48:11
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "A pseudo Operating System for the Dreamcast.".
The branch, master has been updated
via 3294e0a069edd98423b74d071a4d5a4dc5f7e369 (commit)
from 74537233a9cef5befab18beb9c0a723dbc1039ef (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 3294e0a069edd98423b74d071a4d5a4dc5f7e369
Author: Lawrence Sebald <ljs...@us...>
Date: Fri Jun 7 01:47:47 2013 -0400
asm -> __asm__
-----------------------------------------------------------------------
Summary of changes:
kernel/arch/dreamcast/hardware/biosfont.c | 28 +++++++--------
kernel/arch/dreamcast/hardware/scif-spi.c | 2 +-
kernel/arch/dreamcast/hardware/scif.c | 4 +-
kernel/arch/dreamcast/hardware/sq.c | 16 ++++-----
kernel/arch/dreamcast/include/arch/spinlock.h | 10 +++--
kernel/arch/dreamcast/include/dc/fmath_base.h | 46 ++++++++++++------------
kernel/arch/dreamcast/kernel/gdb_stub.c | 2 +-
kernel/arch/dreamcast/kernel/irq.c | 43 ++++++++++-------------
kernel/arch/dreamcast/kernel/mmu.c | 20 +++++-----
9 files changed, 81 insertions(+), 90 deletions(-)
diff --git a/kernel/arch/dreamcast/hardware/biosfont.c b/kernel/arch/dreamcast/hardware/biosfont.c
index a377c6b..c6a2b61 100644
--- a/kernel/arch/dreamcast/hardware/biosfont.c
+++ b/kernel/arch/dreamcast/hardware/biosfont.c
@@ -2,8 +2,8 @@
biosfont.c
- (c)2000-2002 Dan Potter
- Japanese code (c) Kazuaki Matsumoto
+ Copyright (C) 2000-2002 Dan Potter
+ Japanese code Copyright (C) Kazuaki Matsumoto
*/
#include <assert.h>
@@ -67,19 +67,17 @@ int bfont_set_32bit_mode(int on) {
/* A little assembly that grabs the font address */
extern uint8* get_font_address();
-asm(
- " .text\n"
- " .align 2\n"
- "_get_font_address:\n"
- " mov.l syscall_b4,r0\n"
- " mov.l @r0,r0\n"
- " jmp @r0\n"
- " mov #0,r1\n"
- "\n"
- " .align 4\n"
- "syscall_b4:\n"
- " .long 0x8c0000b4\n"
-);
+__asm__(" .text\n"
+ " .align 2\n"
+ "_get_font_address:\n"
+ " mov.l syscall_b4,r0\n"
+ " mov.l @r0,r0\n"
+ " jmp @r0\n"
+ " mov #0,r1\n"
+ "\n"
+ " .align 4\n"
+ "syscall_b4:\n"
+ " .long 0x8c0000b4\n");
/* Shift-JIS -> JIS conversion */
diff --git a/kernel/arch/dreamcast/hardware/scif-spi.c b/kernel/arch/dreamcast/hardware/scif-spi.c
index 6c86534..68bc451 100644
--- a/kernel/arch/dreamcast/hardware/scif-spi.c
+++ b/kernel/arch/dreamcast/hardware/scif-spi.c
@@ -33,7 +33,7 @@
/* This doesn't seem to actually be necessary on any of the SD cards I've tried,
but I'm keeping it around, just in case... */
-#define SD_WAIT() asm("nop\n\tnop\n\tnop\n\tnop\n\tnop")
+#define SD_WAIT() __asm__("nop\n\tnop\n\tnop\n\tnop\n\tnop")
static uint16 scsptr2 = 0;
diff --git a/kernel/arch/dreamcast/hardware/scif.c b/kernel/arch/dreamcast/hardware/scif.c
index 976e1f9..9df880e 100644
--- a/kernel/arch/dreamcast/hardware/scif.c
+++ b/kernel/arch/dreamcast/hardware/scif.c
@@ -240,7 +240,7 @@ int scif_init() {
/* Wait a bit for it to stabilize */
for(i = 0; i < 800000; i++)
- asm("nop");
+ __asm__("nop");
/* Unreset, enable hardware flow control, triggers on 8 bytes */
SCFCR2 = 0x48;
@@ -259,7 +259,7 @@ int scif_init() {
/* Wait a bit for it to stabilize */
for(i = 0; i < 800000; i++)
- asm("nop");
+ __asm__("nop");
return 0;
}
diff --git a/kernel/arch/dreamcast/hardware/sq.c b/kernel/arch/dreamcast/hardware/sq.c
index 1e825bf..d0ef22e 100644
--- a/kernel/arch/dreamcast/hardware/sq.c
+++ b/kernel/arch/dreamcast/hardware/sq.c
@@ -1,7 +1,7 @@
/* KallistiOS ##version##
kernel/arch/dreamcast/hardware/sq.c
- (c)2001 Andrew Kieschnick
+ Copyright (C) 2001 Andrew Kieschnick
*/
#include <dc/sq.h>
@@ -29,7 +29,7 @@ void sq_clr(void *dest, int n) {
n >>= 5;
while(n--) {
- asm("pref @%0" : : "r"(d));
+ __asm__("pref @%0" : : "r"(d));
d += 8;
}
@@ -52,7 +52,7 @@ void * sq_cpy(void *dest, void *src, int n) {
n >>= 5;
while(n--) {
- asm("pref @%0" : : "r"(s + 8)); /* prefetch 32 bytes for next loop */
+ __asm__("pref @%0" : : "r"(s + 8)); /* prefetch 32 bytes for next loop */
d[0] = *(s++);
d[1] = *(s++);
d[2] = *(s++);
@@ -61,7 +61,7 @@ void * sq_cpy(void *dest, void *src, int n) {
d[5] = *(s++);
d[6] = *(s++);
d[7] = *(s++);
- asm("pref @%0" : : "r"(d));
+ __asm__("pref @%0" : : "r"(d));
d += 8;
}
@@ -93,7 +93,7 @@ void * sq_set(void *s, uint32 c, int n) {
n >>= 5;
while(n--) {
- asm("pref @%0" : : "r"(d));
+ __asm__("pref @%0" : : "r"(d));
d += 8;
}
@@ -125,7 +125,7 @@ void * sq_set16(void *s, uint32 c, int n) {
n >>= 5;
while(n--) {
- asm("pref @%0" : : "r"(d));
+ __asm__("pref @%0" : : "r"(d));
d += 8;
}
@@ -153,7 +153,7 @@ void * sq_set32(void *s, uint32 c, int n) {
n >>= 5;
while(n--) {
- asm("pref @%0" : : "r"(d));
+ __asm__("pref @%0" : : "r"(d));
d += 8;
}
@@ -163,5 +163,3 @@ void * sq_set32(void *s, uint32 c, int n) {
return s;
}
-
-
diff --git a/kernel/arch/dreamcast/include/arch/spinlock.h b/kernel/arch/dreamcast/include/arch/spinlock.h
index ed8c7d7..a8c4e03 100644
--- a/kernel/arch/dreamcast/include/arch/spinlock.h
+++ b/kernel/arch/dreamcast/include/arch/spinlock.h
@@ -1,7 +1,7 @@
/* KallistiOS ##version##
arch/dreamcast/include/spinlock.h
- (c)2001 Dan Potter
+ Copyright (C) 2001 Dan Potter
*/
@@ -65,9 +65,11 @@ typedef volatile int spinlock_t;
spinlock_t * __lock = A; \
int __gotlock = 0; \
while(1) { \
- asm volatile ("tas.b @%1\n\t" \
- "movt %0\n\t" \
- : "=r" (__gotlock) : "r" (__lock) : "t", "memory"); \
+ __asm__ __volatile__("tas.b @%1\n\t" \
+ "movt %0\n\t" \
+ : "=r" (__gotlock) \
+ : "r" (__lock) \
+ : "t", "memory"); \
if (!__gotlock) \
thd_pass(); \
else break; \
diff --git a/kernel/arch/dreamcast/include/dc/fmath_base.h b/kernel/arch/dreamcast/include/dc/fmath_base.h
index fae5224..613f9f3 100644
--- a/kernel/arch/dreamcast/include/dc/fmath_base.h
+++ b/kernel/arch/dreamcast/include/dc/fmath_base.h
@@ -23,10 +23,10 @@ __BEGIN_DECLS
/** \cond */
#define __fsin(x) \
({ float __value, __arg = (x), __scale = 10430.37835; \
- asm( "fmul %2,%1\n\t" \
- "ftrc %1,fpul\n\t" \
- "fsca fpul,dr0\n\t" \
- "fmov fr0,%0" \
+ __asm__("fmul %2,%1\n\t" \
+ "ftrc %1,fpul\n\t" \
+ "fsca fpul,dr0\n\t" \
+ "fmov fr0,%0" \
: "=f" (__value), "+&f" (__scale) \
: "f" (__arg) \
: "fpul", "fr0", "fr1"); \
@@ -34,10 +34,10 @@ __BEGIN_DECLS
#define __fcos(x) \
({ float __value, __arg = (x), __scale = 10430.37835; \
- asm( "fmul %2,%1\n\t" \
- "ftrc %1,fpul\n\t" \
- "fsca fpul,dr0\n\t" \
- "fmov fr1,%0" \
+ __asm__("fmul %2,%1\n\t" \
+ "ftrc %1,fpul\n\t" \
+ "fsca fpul,dr0\n\t" \
+ "fmov fr1,%0" \
: "=f" (__value), "+&f" (__scale) \
: "f" (__arg) \
: "fpul", "fr0", "fr1"); \
@@ -45,11 +45,11 @@ __BEGIN_DECLS
#define __ftan(x) \
({ float __value, __arg = (x), __scale = 10430.37835; \
- asm( "fmul %2,%1\n\t" \
- "ftrc %1,fpul\n\t" \
- "fsca fpul,dr0\n\t" \
+ __asm__("fmul %2,%1\n\t" \
+ "ftrc %1,fpul\n\t" \
+ "fsca fpul,dr0\n\t" \
"fdiv fr1, fr0\n\t" \
- "fmov fr0,%0" \
+ "fmov fr0,%0" \
: "=f" (__value), "+&f" (__scale) \
: "f" (__arg) \
: "fpul", "fr0", "fr1"); \
@@ -58,9 +58,9 @@ __BEGIN_DECLS
#define __fisin(x) \
({ float __value, __arg = (x); \
- asm( "lds %1,fpul\n\t" \
- "fsca fpul,dr0\n\t" \
- "fmov fr0,%0" \
+ __asm__("lds %1,fpul\n\t" \
+ "fsca fpul,dr0\n\t" \
+ "fmov fr0,%0" \
: "=f" (__value) \
: "r" (__arg) \
: "fpul", "fr0", "fr1"); \
@@ -68,9 +68,9 @@ __BEGIN_DECLS
#define __ficos(x) \
({ float __value, __arg = (x); \
- asm( "lds %1,fpul\n\t" \
- "fsca fpul,dr0\n\t" \
- "fmov fr1,%0" \
+ __asm__("lds %1,fpul\n\t" \
+ "fsca fpul,dr0\n\t" \
+ "fmov fr1,%0" \
: "=f" (__value) \
: "r" (__arg) \
: "fpul", "fr0", "fr1"); \
@@ -78,10 +78,10 @@ __BEGIN_DECLS
#define __fitan(x) \
({ float __value, __arg = (x); \
- asm( "lds %1,fpul\n\t" \
- "fsca fpul,dr0\n\t" \
+ __asm__("lds %1,fpul\n\t" \
+ "fsca fpul,dr0\n\t" \
"fdiv fr1, fr0\n\t" \
- "fmov fr0,%0" \
+ "fmov fr0,%0" \
: "=f" (__value) \
: "r" (__arg) \
: "fpul", "fr0", "fr1"); \
@@ -90,13 +90,13 @@ __BEGIN_DECLS
#define __fsqrt(x) \
({ float __arg = (x); \
- asm( "fsqrt %0\n\t" \
+ __asm__("fsqrt %0\n\t" \
: "=f" (__arg) : "0" (__arg)); \
__arg; })
#define __frsqrt(x) \
({ float __arg = (x); \
- asm( "fsrra %0\n\t" \
+ __asm__("fsrra %0\n\t" \
: "=f" (__arg) : "0" (__arg)); \
__arg; })
diff --git a/kernel/arch/dreamcast/kernel/gdb_stub.c b/kernel/arch/dreamcast/kernel/gdb_stub.c
index 45247e8..70a00c2 100644
--- a/kernel/arch/dreamcast/kernel/gdb_stub.c
+++ b/kernel/arch/dreamcast/kernel/gdb_stub.c
@@ -293,7 +293,7 @@ static char lowhex(int x) {
* Assembly macros
*/
-#define BREAKPOINT() asm("trapa #0xff"::);
+#define BREAKPOINT() __asm__("trapa #0xff"::);
/*
diff --git a/kernel/arch/dreamcast/kernel/irq.c b/kernel/arch/dreamcast/kernel/irq.c
index 82578e2..d683202 100644
--- a/kernel/arch/dreamcast/kernel/irq.c
+++ b/kernel/arch/dreamcast/kernel/irq.c
@@ -1,7 +1,7 @@
/* KallistiOS ##version##
arch/dreamcast/kernel/irq.c
- (c)2000-2001 Dan Potter
+ Copyright (C) 2000-2001 Dan Potter
*/
/* This module contains low-level handling for IRQs and related exceptions. */
@@ -282,10 +282,10 @@ static int initted = 0;
/* Init routine */
int irq_init() {
/* Save SR and VBR */
- asm("stc sr,r0\n"
- "mov.l r0,%0" : : "m"(pre_sr));
- asm("stc vbr,r0\n"
- "mov.l r0,%0" : : "m"(pre_vbr));
+ __asm__("stc sr,r0\n"
+ "mov.l r0,%0" : : "m"(pre_sr));
+ __asm__("stc vbr,r0\n"
+ "mov.l r0,%0" : : "m"(pre_vbr));
/* Make sure interrupts are disabled */
irq_disable();
@@ -313,35 +313,28 @@ int irq_init() {
/* Set VBR to our exception table above, but don't enable
exceptions and IRQs yet. */
- asm(" ! Set VBR\n"
- " mov.l _vbr_addr,r0\n"
- " ldc r0,vbr\n"
- " bra _after_vbr\n"
- " nop\n"
- " .align 2\n"
- "_vbr_addr:\n"
- " .long _irq_vma_table\n"
- "_after_vbr:\n");
+ __asm__(" ! Set VBR\n"
+ " mov.l _vbr_addr,r0\n"
+ " ldc r0,vbr\n"
+ " bra _after_vbr\n"
+ " nop\n"
+ " .align 2\n"
+ "_vbr_addr:\n"
+ " .long _irq_vma_table\n"
+ "_after_vbr:\n");
initted = 1;
return 0;
}
-
void irq_shutdown() {
if(!initted)
return;
/* Restore SR and VBR */
- asm("mov.l %0,r0\n"
- "ldc r0,sr" : : "m"(pre_sr));
- asm("mov.l %0,r0\n"
- "ldc r0,vbr" : : "m"(pre_vbr));
-
+ __asm__("mov.l %0,r0\n"
+ "ldc r0,sr" : : "m"(pre_sr));
+ __asm__("mov.l %0,r0\n"
+ "ldc r0,vbr" : : "m"(pre_vbr));
}
-
-
-
-
-
diff --git a/kernel/arch/dreamcast/kernel/mmu.c b/kernel/arch/dreamcast/kernel/mmu.c
index ea16079..d9835b3 100644
--- a/kernel/arch/dreamcast/kernel/mmu.c
+++ b/kernel/arch/dreamcast/kernel/mmu.c
@@ -94,22 +94,22 @@ static inline void mmu_ldtlb(int asid, uint32 virt, uint32 phys, int sz, int pr,
int sh, int wt) {
SET_PTEH(virt, asid);
SET_PTEL(phys, 1, sz, pr, c, d, sh, wt);
- asm("ldtlb");
+ __asm__("ldtlb");
}
static inline void mmu_ldtlb_quick(uint32 ptehv, uint32 ptelv) {
*pteh = ptehv;
*ptel = ptelv;
- asm("ldtlb");
+ __asm__("ldtlb");
}
static inline void mmu_ldtlb_wait() {
- asm("nop");
- asm("nop");
- asm("nop");
- asm("nop");
- asm("nop");
- asm("nop");
- asm("nop");
- asm("nop");
+ __asm__("nop");
+ __asm__("nop");
+ __asm__("nop");
+ __asm__("nop");
+ __asm__("nop");
+ __asm__("nop");
+ __asm__("nop");
+ __asm__("nop");
}
/* Defined in mmuitlb.s */
hooks/post-receive
--
A pseudo Operating System for the Dreamcast.
|
