Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Activate strict FFI #15683

Merged
merged 2 commits into from
Feb 14, 2024
Merged

Activate strict FFI #15683

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
15c6cf4
Revert "Revert "[WIP] Redo "Activate strict FFI""""
guillep Dec 4, 2023
bf1bdef
Specify missing types in SDL2 bindings
guillep Feb 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/Athens-Cairo/AthensCairoCanvas.class.st
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,8 +227,8 @@ AthensCairoCanvas >> primResetDashes: anOffset [
double offset);"
^ self ffiCall: #(void cairo_set_dash (
self,
0,
0,
void* 0,
int 0,
double anOffset) )
]

Expand Down
22 changes: 14 additions & 8 deletions src/Athens-Cairo/CairoFontMetricsProvider.class.st
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,17 @@ CairoFontMetricsProvider >> cairoFont [

{ #category : 'private' }
CairoFontMetricsProvider >> convertString: utf8String len: strlen ofFont: aScaledFont toGlyphs: glyphs numGlyphs: numGlyphs x: x y: y [
"
all of this for using
http://www.cairographics.org/manual/cairo-User-Fonts.html#cairo-user-scaled-font-text-to-glyphs-func-t

"
"cairo_status_t
cairo_scaled_font_text_to_glyphs (cairo_scaled_font_t *scaled_font,
double x,
double y,
const char *utf8,
int utf8_len,
cairo_glyph_t **glyphs,
int *num_glyphs,
cairo_text_cluster_t **clusters,
int *num_clusters,
cairo_text_cluster_flags_t *cluster_flags);"
^ self ffiCall: #(
cairo_status_t cairo_scaled_font_text_to_glyphs (CairoScaledFont aScaledFont,
double x,
Expand All @@ -55,9 +61,9 @@ http://www.cairographics.org/manual/cairo-User-Fonts.html#cairo-user-scaled-font
int strlen,
void ** glyphs,
int * numGlyphs,
NULL,
NULL,
NULL))
void* 0,
void* 0,
void* 0))
]

{ #category : 'accessing' }
Expand Down
6 changes: 3 additions & 3 deletions src/OSWindow-SDL2/SDL2.class.st
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,7 @@ SDL2 class >> moduleName [

{ #category : 'mouse' }
SDL2 class >> mouseState [
^ self ffiCall: #( Uint32 SDL_GetMouseState ( nil , nil ) )
^ self ffiCall: #( Uint32 SDL_GetMouseState ( int* 0 , int* 0) )
]

{ #category : 'mouse' }
Expand Down Expand Up @@ -377,8 +377,8 @@ SDL2 class >> primClipboardText: text [
{ #category : 'cairo' }
SDL2 class >> primCreateRGBSurfaceForCairoWidth: width height: height [
^ self ffiCall: #( SDL_Surface* SDL_CreateRGBSurface
( 0 , int width , int height , 32 ,
16r00FF0000 , 16r0000FF00 , 16r000000FF , 0 ) )
( Uint32 0 , int width , int height , int 32 ,
Uint32 16r00FF0000 , Uint32 16r0000FF00 , Uint32 16r000000FF , 0 ) )
]

{ #category : 'audio' }
Expand Down
6 changes: 3 additions & 3 deletions src/OSWindow-SDL2/SDL_Renderer.class.st
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ SDL_Renderer >> clear [

{ #category : 'rendering' }
SDL_Renderer >> copy: texture [
^ self ffiCall: #( int SDL_RenderCopy ( self , SDL_Texture texture , nil, nil ) )
^ self ffiCall: #( int SDL_RenderCopy ( self , SDL_Texture texture , void* 0, void* 0 ) )
]

{ #category : 'rendering' }
Expand Down Expand Up @@ -113,12 +113,12 @@ SDL_Renderer >> initialize [

{ #category : 'rendering' }
SDL_Renderer >> noClipRect [
^ self ffiCall: #( int SDL_RenderSetClipRect ( self , nil ) )
^ self ffiCall: #( int SDL_RenderSetClipRect ( self , void* nil ) )
]

{ #category : 'rendering' }
SDL_Renderer >> noRenderTarget [
^ self ffiCall: #( int SDL_SetRenderTarget ( self , nil ) )
^ self ffiCall: #( int SDL_SetRenderTarget ( self , void* nil ) )
]

{ #category : 'rendering' }
Expand Down
4 changes: 2 additions & 2 deletions src/OSWindow-SDL2/SDL_Texture.class.st
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ SDL_Texture >> initialize [

{ #category : 'pixels handling' }
SDL_Texture >> lockPixels: pixels pitch: pitch [
^ self ffiCall: #( int SDL_LockTexture ( self , nil , void** pixels , int* pitch ) )
^ self ffiCall: #( int SDL_LockTexture ( self , void* 0 , void** pixels , int* pitch ) )
]

{ #category : 'private' }
Expand All @@ -69,7 +69,7 @@ SDL_Texture >> unlock [

{ #category : 'initialization' }
SDL_Texture >> updateTexturePixels: pixels pitch: pitch [
^ self ffiCall: #( int SDL_UpdateTexture ( self , nil , void* pixels , int pitch ) )
^ self ffiCall: #( int SDL_UpdateTexture ( self , void* nil , void* pixels , int pitch ) )
]

{ #category : 'initialization' }
Expand Down
6 changes: 3 additions & 3 deletions src/System-OSEnvironments/UnixEnvironment.class.st
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,9 +285,9 @@ UnixEnvironment >> removeKey: key encoded: anEncoding [
^ self rawRemoveKey: (key encodeWith: anEncoding)
]

{ #category : 'private' }
{ #category : 'accessing' }
UnixEnvironment >> setEnv: nameString value: valueString [
"This method calls the Standard C Library setenv() function"
"int setenv(const char *name, const char *value, int overwrite);"

^ self ffiCall: #(int setenv #(String nameString , String valueString , 1)) module: LibC
^ self ffiCall: #(int setenv #(String nameString , String valueString , int 1)) module: LibC
]
4 changes: 2 additions & 2 deletions src/UnifiedFFI-Tests/FFICalloutAPITest.class.st
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,12 @@ FFICalloutAPITest >> ffiLongLongAbs: number [

{ #category : 'primitives constant' }
FFICalloutAPITest >> ffiTestConstantFormat: format to: buffer [
^ self ffiCall: #( int sprintf ( ByteArray buffer, String format, 65, 65, 1 ) ) fixedArgumentCount: 2
^ self ffiCall: #( int sprintf ( ByteArray buffer, String format, int 65, int 65, int 1 ) ) fixedArgumentCount: 2
]

{ #category : 'primitives constant' }
FFICalloutAPITest >> ffiTestContantFormat: format value: aNumber to: buffer [
^ self ffiCall: #( int sprintf ( ByteArray buffer, String format, 65, 65, long aNumber ) ) fixedArgumentCount: 2
^ self ffiCall: #( int sprintf ( ByteArray buffer, String format, int 65, int 65, long aNumber ) ) fixedArgumentCount: 2
]

{ #category : 'primitives atomic' }
Expand Down
2 changes: 1 addition & 1 deletion src/UnifiedFFI/FFILibrary.class.st
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ FFILibrary class >> new [
{ #category : 'options' }
FFILibrary class >> options [

^ #()
^ #( #+ optStrict )
]

{ #category : 'instance creation' }
Expand Down
10 changes: 10 additions & 0 deletions src/UnifiedFFI/FFIStrictResolutionMode.class.st
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,15 @@ FFIStrictResolutionMode >> isStrict [
{ #category : 'resolution' }
FFIStrictResolutionMode >> resolveUndeclaredTypeForArgument: aFFIValueArgument withResolver: aResolver [

"Make strict all declarations except those using self.
This is safe because:
- We can infer self from the current class
- the only implementor of prepareAsSelfFromCalloutDeclaration are those classes representing pointers"
aFFIValueArgument value == #self ifTrue: [
| externalType |
externalType := aResolver requestor asExternalTypeOn: aResolver.
^ externalType prepareAsSelfFromCalloutDeclaration ].

"Otherwise, this is an untyped literal which is unsupported"
aResolver unsupportedUntypedLiteral: aFFIValueArgument value
]