Browse Source

Removed use of .x files.

woollybah 8 years ago
parent
commit
13c476d3a2

+ 11 - 11
appstub.mod/debugger_mt.stdio.bmx

@@ -26,7 +26,7 @@ End Extern
 
 Extern
 	Function bbIsMainThread:Int()="bbIsMainThread"
-	Function bbGCValidate:Int( mem:Byte Ptr ) = "bbGCValidate"
+	Function bbGCValidate:Int( mem:Byte Ptr ) = "int bbGCValidate( void * )!"
 
 	Function DebugScopeName:String( scope:Int Ptr )="bmx_debugger_DebugScopeName"
 	Function bmx_debugger_DebugScopeKind:UInt( scope:Int Ptr )
@@ -63,7 +63,7 @@ Extern
 	Function bmx_debugger_ref_bbEmptyString:Byte Ptr()
 	Function bmx_debugger_ref_brl_blitz_NullFunctionError:Byte Ptr()
 	
-	Function bbObjectStructInfo:Byte Ptr(name:Byte Ptr)
+	Function bbObjectStructInfo:Byte Ptr(name:Byte Ptr)="BBDebugScope * bbObjectStructInfo( char * )!"
 End Extern
 
 ?Not ptr64
@@ -518,14 +518,14 @@ EndFunction
 'End Function
 
 Extern
-Global bbOnDebugStop()
-Global bbOnDebugLog( message$ )
-Global bbOnDebugEnterStm( stm:Int Ptr )
-Global bbOnDebugEnterScope( scope:Int Ptr)',inst:Byte Ptr )
-Global bbOnDebugLeaveScope()
-Global bbOnDebugPushExState()
-Global bbOnDebugPopExState()
-Global bbOnDebugUnhandledEx( ex:Object )
+Global bbOnDebugStop()="void bbOnDebugStop()!"
+Global bbOnDebugLog( message$ )="void bbOnDebugLog( BBString * )!"
+Global bbOnDebugEnterStm( stm:Int Ptr )="void bbOnDebugEnterStm( BBDebugStm * )!"
+Global bbOnDebugEnterScope( scope:Int Ptr)="void bbOnDebugEnterScope( BBDebugScope * )!"
+Global bbOnDebugLeaveScope()="void bbOnDebugLeaveScope()!"
+Global bbOnDebugPushExState()="void bbOnDebugPushExState()!"
+Global bbOnDebugPopExState()="void bbOnDebugPopExState()!"
+Global bbOnDebugUnhandledEx( ex:Object )="void bbOnDebugUnhandledEx( BBObject * )!"
 End Extern
 
 bbOnDebugStop=OnDebugStop
@@ -568,7 +568,7 @@ End Type
 Extern
 Function bbThreadAllocData:Int()
 Function bbThreadSetData( index:Int,data:Object )
-Function bbThreadGetData:TDbgState( index:Int )
+Function bbThreadGetData:TDbgState( index:Int )="BBObject* bbThreadGetData(int )!"
 End Extern
 ?
 

+ 0 - 12
appstub.mod/debugger_mt.stdio.x

@@ -1,12 +0,0 @@
-void bbOnDebugStop()!
-void bbOnDebugLog( BBString * )!
-void bbOnDebugEnterStm( BBDebugStm * )!
-void bbOnDebugEnterScope( BBDebugScope * )!
-void bbOnDebugLeaveScope()!
-void bbOnDebugPushExState()!
-void bbOnDebugPopExState()!
-void bbOnDebugUnhandledEx( BBObject * )!
-int   bbGCValidate( void * )!
-BBObject* bbThreadGetData(int )!
-BBDebugScope * bbObjectStructInfo( char * )!
-

+ 6 - 6
blitz.mod/blitz.bmx

@@ -339,13 +339,13 @@ Rem
 bbdoc: Allocate memory
 returns: A new block of memory @size bytes long
 End Rem
-Function MemAlloc:Byte Ptr( size:Long )="bbMemAlloc"
+Function MemAlloc:Byte Ptr( size:Long )="void* bbMemAlloc( size_t )"
 
 Rem
 bbdoc: Free allocated memory
 about: The memory specified by @mem must have been previously allocated by #MemAlloc or #MemExtend.
 End Rem
-Function MemFree( mem:Byte Ptr )="bbMemFree"
+Function MemFree( mem:Byte Ptr )="void bbMemFree( void * )"
 
 Rem
 bbdoc: Extend a block of memory
@@ -353,22 +353,22 @@ returns: A new block of memory @new_size bytes long
 about: An existing block of memory specified by @mem and @size is copied into a new block
 of memory @new_size bytes long. The existing block is released and the new block is returned. 
 End Rem
-Function MemExtend:Byte Ptr( mem:Byte Ptr,size:Long,new_size:Long )="bbMemExtend"
+Function MemExtend:Byte Ptr( mem:Byte Ptr,size:Long,new_size:Long )="void* bbMemExtend( void *,size_t ,size_t )"
 
 Rem
 bbdoc: Clear a block of memory to 0
 End Rem
-Function MemClear( mem:Byte Ptr,size:Long )="bbMemClear"
+Function MemClear( mem:Byte Ptr,size:Long )="void bbMemClear( void *,size_t )"
 
 Rem
 bbdoc: Copy a non-overlapping block of memory
 End Rem
-Function MemCopy( dst:Byte Ptr,src:Byte Ptr,size:Long )="bbMemCopy"
+Function MemCopy( dst:Byte Ptr,src:Byte Ptr,size:Long )="void bbMemCopy( void *,const void *,size_t )"
 
 Rem
 bbdoc: Copy a potentially overlapping block of memory
 End Rem
-Function MemMove( dst:Byte Ptr,src:Byte Ptr,size:Long )="bbMemMove"
+Function MemMove( dst:Byte Ptr,src:Byte Ptr,size:Long )="void bbMemMove( void *,const void *,size_t )"
 
 Rem
 bbdoc: Set garbage collector mode

+ 0 - 6
blitz.mod/blitz.x

@@ -1,6 +0,0 @@
-void bbMemCopy( void *,const void *,size_t )
-void bbMemMove( void *,const void *,size_t )
-void* bbMemAlloc( size_t )
-void bbMemFree( void * )
-void* bbMemExtend( void *,size_t ,size_t )
-void bbMemClear( void *,size_t )

+ 6 - 6
reflection.mod/reflection.bmx

@@ -33,16 +33,16 @@ Private
 
 Extern
 
-Function bbObjectNew:Object( class:Byte Ptr )
+Function bbObjectNew:Object( class:Byte Ptr )="BBObject * bbObjectNew(BBClass *)!"
 ?Not ptr64
-Function bbObjectRegisteredTypes:Int Ptr( count Var )
-Function bbObjectRegisteredInterfaces:Int Ptr( count Var )
+Function bbObjectRegisteredTypes:Int Ptr( count Var )="BBClass** bbObjectRegisteredTypes(int *)!"
+Function bbObjectRegisteredInterfaces:Int Ptr( count Var )="BBInterface** bbObjectRegisteredInterfaces(int *)!"
 ?ptr64
-Function bbObjectRegisteredTypes:Long Ptr( count Var )
-Function bbObjectRegisteredInterfaces:Long Ptr( count Var )
+Function bbObjectRegisteredTypes:Long Ptr( count Var )="BBClass** bbObjectRegisteredTypes(int *)!"
+Function bbObjectRegisteredInterfaces:Long Ptr( count Var )="BBInterface** bbObjectRegisteredInterfaces(int *)!"
 ?
 
-Function bbArrayNew1D:Object( typeTag:Byte Ptr,length )
+Function bbArrayNew1D:Object( typeTag:Byte Ptr,length )="BBArray* bbArrayNew1D(const char *,int )!"
 
 
 Function bbRefArrayClass:Byte Ptr()

+ 0 - 4
reflection.mod/reflection.x

@@ -1,4 +0,0 @@
-BBObject * bbObjectNew(BBClass *)!
-BBClass** bbObjectRegisteredTypes(int *)!
-BBInterface** bbObjectRegisteredInterfaces(int *)!
-BBArray* bbArrayNew1D(const char *,int )!

+ 5 - 5
socket.mod/socket.bmx

@@ -22,7 +22,7 @@ Private
 Extern "os"
 ?Win32
 Const FIONREAD=$4004667F
-Function ioctl_( socket,opt,buf:Byte Ptr )="ioctlsocket"
+Function ioctl_( socket,opt,buf:Byte Ptr )="int ioctlsocket(SOCKET ,long ,u_long *)!"
 ?MacOS
 Const FIONREAD=$4004667F
 Function ioctl_( socket,opt,buf:Byte Ptr )="ioctl"
@@ -45,14 +45,14 @@ End Type
 
 Type TSocket
 
-	Method Send:size_t( buf:Byte Ptr,count:size_t,flags=0 )
-		Local n:size_t=send_( _socket,buf,count,flags )
+	Method Send:Size_T( buf:Byte Ptr,count:Size_T,flags=0 )
+		Local n:Size_T=send_( _socket,buf,count,flags )
 		If n<0 Return 0
 		Return n
 	End Method
 
-	Method Recv:size_t( buf:Byte Ptr,count:size_t,flags=0 )
-		Local n:size_t=recv_( _socket,buf,count,flags )
+	Method Recv:Size_T( buf:Byte Ptr,count:Size_T,flags=0 )
+		Local n:Size_T=recv_( _socket,buf,count,flags )
 		If n<0 Return 0
 		Return n
 	End Method

+ 0 - 1
socket.mod/socket.x

@@ -1 +0,0 @@
-int ioctlsocket(SOCKET ,long ,u_long *)!

+ 5 - 5
threads.mod/threads.bmx

@@ -27,8 +27,8 @@ Function bbThreadAllocData:Int()
 Function bbThreadSetData( index:Int,data:Object )
 Function bbThreadGetData:Object( index:Int )
 
-Function bbAtomicCAS:Int( target:Int Ptr,old_value:Int,new_value:Int )
-Function bbAtomicAdd:Int( target:Int Ptr,value:Int )
+Function bbAtomicCAS:Int( target:Int Ptr,old_value:Int,new_value:Int )="int bbAtomicCAS( int *,int ,int )!"
+Function bbAtomicAdd:Int( target:Int Ptr,value:Int )="int bbAtomicAdd( int *,int )!"
 
 Function threads_CreateThread:Byte Ptr( entry:Object( data:Object ),data:Object )
 Function threads_DetachThread( thread:Byte Ptr )
@@ -538,7 +538,7 @@ about:
 Atomically replace @target with @new_value if @target equals @old_value.
 End Rem
 Function CompareAndSwap:Int( target:Int Var,oldValue:Int,newValue:Int )
-	Return bbAtomicCAS( VarPtr target,oldValue,newValue )
+	Return bbAtomicCAS( Varptr target,oldValue,newValue )
 End Function
 
 Rem
@@ -548,7 +548,7 @@ about:
 Atomically add @value to @target.
 End Rem
 Function AtomicAdd:Int( target:Int Var,value:Int )
-	Return bbAtomicAdd( VarPtr target,value )
+	Return bbAtomicAdd( Varptr target,value )
 End Function
 
 Rem
@@ -558,7 +558,7 @@ End Rem
 Function AtomicSwap:Int( target:Int Var,value:Int )
 	Repeat
 		Local oldval:Int=target
-		If CompareAndSwap( VarPtr target,oldval,value ) Return oldval
+		If CompareAndSwap( Varptr target,oldval,value ) Return oldval
 	Forever
 End Function
 

+ 0 - 2
threads.mod/threads.x

@@ -1,2 +0,0 @@
-int bbAtomicAdd( int *,int )!
-int bbAtomicCAS( int *,int ,int )!