JavaNativeMethod.st
author Jan Vrany <jan.vrany@fit.cvut.cz>
Thu, 31 Jan 2013 13:08:59 +0000
branchrefactoring-vmdata
changeset 2016 6afb298c7403
parent 2010 9bacff8c53de
child 2019 e1291a81f215
permissions -rw-r--r--
Added simple trampoline methods to JavaNativeMethod. However, they are not used now. This is an intermediate step.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
877
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 772
diff changeset
     1
"
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 772
diff changeset
     2
 COPYRIGHT (c) 1996-2011 by Claus Gittinger
1152
040cba55a7d2 Copyright fixes
vranyj1
parents: 1075
diff changeset
     3
1155
vranyj1
parents: 1152
diff changeset
     4
 New code and modifications done at SWING Research Group [1]:
1152
040cba55a7d2 Copyright fixes
vranyj1
parents: 1075
diff changeset
     5
877
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 772
diff changeset
     6
 COPYRIGHT (c) 2010-2011 by Jan Vrany, Jan Kurs and Marcel Hlopko
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 772
diff changeset
     7
                            SWING Research Group, Czech Technical University in Prague
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 772
diff changeset
     8
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 772
diff changeset
     9
 This software is furnished under a license and may be used
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 772
diff changeset
    10
 only in accordance with the terms of that license and with the
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 772
diff changeset
    11
 inclusion of the above copyright notice.   This software may not
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 772
diff changeset
    12
 be provided or otherwise made available to, or used by, any
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 772
diff changeset
    13
 other person.  No title to or ownership of the software is
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 772
diff changeset
    14
 hereby transferred.
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 772
diff changeset
    15
1155
vranyj1
parents: 1152
diff changeset
    16
 [1] Code written at SWING Research Group contains a signature
vranyj1
parents: 1152
diff changeset
    17
     of one of the above copright owners. For exact set of such code,
vranyj1
parents: 1152
diff changeset
    18
     see the differences between this version and version stx:libjava
1152
040cba55a7d2 Copyright fixes
vranyj1
parents: 1075
diff changeset
    19
     as of 1.9.2010
877
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 772
diff changeset
    20
"
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    21
"{ Package: 'stx:libjava' }"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    22
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    23
JavaMethodWithHandler variableSubclass:#JavaNativeMethod
1749
2a942f354a94 - JavaNativeMethod
vranyj1
parents: 1748
diff changeset
    24
	instanceVariableNames:'nativeImplementation nCalls'
1075
927aeb3649fc Fix in native method imp -> class loading java tests all pass.. I'm getting drunk tonight :)
hlopkmar
parents: 1073
diff changeset
    25
	classVariableNames:'CacheNativeImplementation Verbose'
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    26
	poolDictionaries:''
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    27
	category:'Languages-Java-Classes'
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    28
!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    29
877
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 772
diff changeset
    30
!JavaNativeMethod class methodsFor:'documentation'!
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 772
diff changeset
    31
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 772
diff changeset
    32
copyright
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 772
diff changeset
    33
"
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 772
diff changeset
    34
 COPYRIGHT (c) 1996-2011 by Claus Gittinger
1152
040cba55a7d2 Copyright fixes
vranyj1
parents: 1075
diff changeset
    35
1155
vranyj1
parents: 1152
diff changeset
    36
 New code and modifications done at SWING Research Group [1]:
1152
040cba55a7d2 Copyright fixes
vranyj1
parents: 1075
diff changeset
    37
877
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 772
diff changeset
    38
 COPYRIGHT (c) 2010-2011 by Jan Vrany, Jan Kurs and Marcel Hlopko
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 772
diff changeset
    39
                            SWING Research Group, Czech Technical University in Prague
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 772
diff changeset
    40
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 772
diff changeset
    41
 This software is furnished under a license and may be used
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 772
diff changeset
    42
 only in accordance with the terms of that license and with the
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 772
diff changeset
    43
 inclusion of the above copyright notice.   This software may not
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 772
diff changeset
    44
 be provided or otherwise made available to, or used by, any
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 772
diff changeset
    45
 other person.  No title to or ownership of the software is
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 772
diff changeset
    46
 hereby transferred.
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 772
diff changeset
    47
1155
vranyj1
parents: 1152
diff changeset
    48
 [1] Code written at SWING Research Group contains a signature
vranyj1
parents: 1152
diff changeset
    49
     of one of the above copright owners. For exact set of such code,
vranyj1
parents: 1152
diff changeset
    50
     see the differences between this version and version stx:libjava
1152
040cba55a7d2 Copyright fixes
vranyj1
parents: 1075
diff changeset
    51
     as of 1.9.2010
877
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 772
diff changeset
    52
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 772
diff changeset
    53
"
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 772
diff changeset
    54
! !
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    55
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    56
!JavaNativeMethod class methodsFor:'initialization'!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    57
761
43e017ec7958 Merged with /branches/jk
vranyj1
parents: 752
diff changeset
    58
cacheNativeImplementation
43e017ec7958 Merged with /branches/jk
vranyj1
parents: 752
diff changeset
    59
43e017ec7958 Merged with /branches/jk
vranyj1
parents: 752
diff changeset
    60
    "For details, see #cacheNativeImplementation:"
43e017ec7958 Merged with /branches/jk
vranyj1
parents: 752
diff changeset
    61
    
43e017ec7958 Merged with /branches/jk
vranyj1
parents: 752
diff changeset
    62
    ^CacheNativeImplementation
43e017ec7958 Merged with /branches/jk
vranyj1
parents: 752
diff changeset
    63
43e017ec7958 Merged with /branches/jk
vranyj1
parents: 752
diff changeset
    64
    "Created: / 30-04-2011 / 23:38:21 / Jan Vrany <jan.vrany@fit.cvut.cz>"
43e017ec7958 Merged with /branches/jk
vranyj1
parents: 752
diff changeset
    65
!
43e017ec7958 Merged with /branches/jk
vranyj1
parents: 752
diff changeset
    66
43e017ec7958 Merged with /branches/jk
vranyj1
parents: 752
diff changeset
    67
cacheNativeImplementation: aBoolean
43e017ec7958 Merged with /branches/jk
vranyj1
parents: 752
diff changeset
    68
43e017ec7958 Merged with /branches/jk
vranyj1
parents: 752
diff changeset
    69
    "If set, native implementations are cached, resulting
43e017ec7958 Merged with /branches/jk
vranyj1
parents: 752
diff changeset
    70
     in better performance when calling native methods.
43e017ec7958 Merged with /branches/jk
vranyj1
parents: 752
diff changeset
    71
     Hower, no change in native method implemenetaion will
43e017ec7958 Merged with /branches/jk
vranyj1
parents: 752
diff changeset
    72
     not be visible then, unless #flushAllCachedNativeMethods
43e017ec7958 Merged with /branches/jk
vranyj1
parents: 752
diff changeset
    73
     is explictely called"
43e017ec7958 Merged with /branches/jk
vranyj1
parents: 752
diff changeset
    74
43e017ec7958 Merged with /branches/jk
vranyj1
parents: 752
diff changeset
    75
    CacheNativeImplementation := aBoolean
43e017ec7958 Merged with /branches/jk
vranyj1
parents: 752
diff changeset
    76
43e017ec7958 Merged with /branches/jk
vranyj1
parents: 752
diff changeset
    77
    "Created: / 30-04-2011 / 23:38:10 / Jan Vrany <jan.vrany@fit.cvut.cz>"
43e017ec7958 Merged with /branches/jk
vranyj1
parents: 752
diff changeset
    78
!
43e017ec7958 Merged with /branches/jk
vranyj1
parents: 752
diff changeset
    79
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    80
initialize
2016
6afb298c7403 Added simple trampoline methods to JavaNativeMethod.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2010
diff changeset
    81
    self flags: ((self flags bitClear: Behavior flagMethod) bitOr: Behavior flagJavaMethod).
6afb298c7403 Added simple trampoline methods to JavaNativeMethod.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2010
diff changeset
    82
    "
6afb298c7403 Added simple trampoline methods to JavaNativeMethod.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2010
diff changeset
    83
    self flags: ((self flags bitClear: Behavior flagJavaMethod) bitOr: Behavior flagMethod).
6afb298c7403 Added simple trampoline methods to JavaNativeMethod.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2010
diff changeset
    84
    "
6afb298c7403 Added simple trampoline methods to JavaNativeMethod.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2010
diff changeset
    85
    "By default, do not cache native impls while developing"
761
43e017ec7958 Merged with /branches/jk
vranyj1
parents: 752
diff changeset
    86
    CacheNativeImplementation := Smalltalk isStandAloneApp.
1075
927aeb3649fc Fix in native method imp -> class loading java tests all pass.. I'm getting drunk tonight :)
hlopkmar
parents: 1073
diff changeset
    87
    Verbose := false.
927aeb3649fc Fix in native method imp -> class loading java tests all pass.. I'm getting drunk tonight :)
hlopkmar
parents: 1073
diff changeset
    88
    "
2016
6afb298c7403 Added simple trampoline methods to JavaNativeMethod.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2010
diff changeset
    89
    Verbose := true.
6afb298c7403 Added simple trampoline methods to JavaNativeMethod.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2010
diff changeset
    90
    "
761
43e017ec7958 Merged with /branches/jk
vranyj1
parents: 752
diff changeset
    91
1075
927aeb3649fc Fix in native method imp -> class loading java tests all pass.. I'm getting drunk tonight :)
hlopkmar
parents: 1073
diff changeset
    92
    "Modified (comment): / 03-11-2011 / 10:48:12 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
2016
6afb298c7403 Added simple trampoline methods to JavaNativeMethod.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2010
diff changeset
    93
    "Modified: / 31-01-2013 / 13:06:39 / Jan Vrany <jan.vrany@fit.cvut.cz>"
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    94
! !
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    95
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    96
!JavaNativeMethod class methodsFor:'cleanup'!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    97
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    98
flushAllCachedNativeMethods
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    99
    self allInstancesDo:[:aNativeMethod |
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   100
        aNativeMethod nativeImplementation:nil
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   101
    ].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   102
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   103
    "
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   104
     self flushAllCachedNativeMethods
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   105
    "
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   106
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   107
    "Created: / 24.12.1999 / 03:10:38 / cg"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   108
    "Modified: / 24.12.1999 / 03:10:51 / cg"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   109
! !
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   110
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   111
!JavaNativeMethod methodsFor:'accessing'!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   112
1749
2a942f354a94 - JavaNativeMethod
vranyj1
parents: 1748
diff changeset
   113
nCalls
2a942f354a94 - JavaNativeMethod
vranyj1
parents: 1748
diff changeset
   114
    ^ nCalls ? 0
2a942f354a94 - JavaNativeMethod
vranyj1
parents: 1748
diff changeset
   115
2a942f354a94 - JavaNativeMethod
vranyj1
parents: 1748
diff changeset
   116
    "Modified: / 27-10-2012 / 18:05:49 / Jan Vrany <jan.vrany@fit.cvut.cz>"
2a942f354a94 - JavaNativeMethod
vranyj1
parents: 1748
diff changeset
   117
!
2a942f354a94 - JavaNativeMethod
vranyj1
parents: 1748
diff changeset
   118
1754
b3cde0c1c2b1 - do not enforce Java native code optimization off
vranyj1
parents: 1749
diff changeset
   119
nCallsReset
b3cde0c1c2b1 - do not enforce Java native code optimization off
vranyj1
parents: 1749
diff changeset
   120
    nCalls := 0
b3cde0c1c2b1 - do not enforce Java native code optimization off
vranyj1
parents: 1749
diff changeset
   121
b3cde0c1c2b1 - do not enforce Java native code optimization off
vranyj1
parents: 1749
diff changeset
   122
    "Modified: / 27-10-2012 / 18:05:49 / Jan Vrany <jan.vrany@fit.cvut.cz>"
b3cde0c1c2b1 - do not enforce Java native code optimization off
vranyj1
parents: 1749
diff changeset
   123
!
b3cde0c1c2b1 - do not enforce Java native code optimization off
vranyj1
parents: 1749
diff changeset
   124
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   125
nativeImplementation
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   126
    "return the value of the instance variable 'nativeImplementation' (automatically generated)"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   127
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   128
    ^ nativeImplementation
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   129
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   130
    "Created: / 25.9.1999 / 23:08:00 / cg"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   131
!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   132
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   133
nativeImplementation:something
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   134
    "set the value of the instance variable 'nativeImplementation' (automatically generated)"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   135
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   136
    nativeImplementation := something.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   137
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   138
    "Created: / 25.9.1999 / 23:08:00 / cg"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   139
!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   140
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   141
sourceLineNumber
1213
fc90769151e8 - fix in reflection over methods (signature is nil for non-generic methods)
vranyj1
parents: 1155
diff changeset
   142
fc90769151e8 - fix in reflection over methods (signature is nil for non-generic methods)
vranyj1
parents: 1155
diff changeset
   143
    ^super sourceLineNumber
fc90769151e8 - fix in reflection over methods (signature is nil for non-generic methods)
vranyj1
parents: 1155
diff changeset
   144
fc90769151e8 - fix in reflection over methods (signature is nil for non-generic methods)
vranyj1
parents: 1155
diff changeset
   145
"/    ForceByteCodeDisplay == true ifTrue:[ ^ 1].
fc90769151e8 - fix in reflection over methods (signature is nil for non-generic methods)
vranyj1
parents: 1155
diff changeset
   146
"/    lineNumberTable notNil ifTrue:[ ^ lineNumberTable at:2].
fc90769151e8 - fix in reflection over methods (signature is nil for non-generic methods)
vranyj1
parents: 1155
diff changeset
   147
"/    ^1
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   148
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   149
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   150
    "
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   151
    ^ (JavaSourceCodeCache new) 
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   152
        findLineForMethod:(self selector)
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   153
        inClass:javaClass.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   154
    "
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   155
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   156
    "Modified: / 13-12-2010 / 13:55:55 / Jan Kurs <kurs.jan@post.cz>"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   157
    "Modified: / 13-12-2010 / 23:46:30 / Marcel Hlopko <hlopik@gmail.com>"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   158
    "Created: / 17-12-2010 / 10:34:43 / Jan Vrany <jan.vrany@fit.cvut.cz>"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   159
! !
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   160
761
43e017ec7958 Merged with /branches/jk
vranyj1
parents: 752
diff changeset
   161
!JavaNativeMethod methodsFor:'private'!
43e017ec7958 Merged with /branches/jk
vranyj1
parents: 752
diff changeset
   162
43e017ec7958 Merged with /branches/jk
vranyj1
parents: 752
diff changeset
   163
compileNativeImplementation: sel dispatchingTo: oldSel
43e017ec7958 Merged with /branches/jk
vranyj1
parents: 752
diff changeset
   164
1985
7c5a14d663ba Temporary commit. JavaNativeMethod refactored to use new-style native methods.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 1974
diff changeset
   165
    | src arg converted header |
761
43e017ec7958 Merged with /branches/jk
vranyj1
parents: 752
diff changeset
   166
    src := (JavaVM class compiledMethodAt: oldSel) source.
43e017ec7958 Merged with /branches/jk
vranyj1
parents: 752
diff changeset
   167
    src := src asStringCollection.
43e017ec7958 Merged with /branches/jk
vranyj1
parents: 752
diff changeset
   168
    (src first includesString: 'aJavaContext') ifTrue:[
43e017ec7958 Merged with /branches/jk
vranyj1
parents: 752
diff changeset
   169
        arg := 'aJavaContext'
43e017ec7958 Merged with /branches/jk
vranyj1
parents: 752
diff changeset
   170
    ] ifFalse:[
43e017ec7958 Merged with /branches/jk
vranyj1
parents: 752
diff changeset
   171
        (src first includesString: 'nativeContext') ifTrue:[
43e017ec7958 Merged with /branches/jk
vranyj1
parents: 752
diff changeset
   172
            arg := 'nativeContext'
43e017ec7958 Merged with /branches/jk
vranyj1
parents: 752
diff changeset
   173
        ]
43e017ec7958 Merged with /branches/jk
vranyj1
parents: 752
diff changeset
   174
    ].
43e017ec7958 Merged with /branches/jk
vranyj1
parents: 752
diff changeset
   175
    arg ifNotNil:[
43e017ec7958 Merged with /branches/jk
vranyj1
parents: 752
diff changeset
   176
        src removeFirst asString.
43e017ec7958 Merged with /branches/jk
vranyj1
parents: 752
diff changeset
   177
        converted := true.
43e017ec7958 Merged with /branches/jk
vranyj1
parents: 752
diff changeset
   178
    ] ifNil:[
43e017ec7958 Merged with /branches/jk
vranyj1
parents: 752
diff changeset
   179
        arg := 'nativeContext'.
43e017ec7958 Merged with /branches/jk
vranyj1
parents: 752
diff changeset
   180
        src := '    self breakPoint: #jv info: ''Convert it to new-style natives''.
43e017ec7958 Merged with /branches/jk
vranyj1
parents: 752
diff changeset
   181
43e017ec7958 Merged with /branches/jk
vranyj1
parents: 752
diff changeset
   182
                ^ self ', oldSel, ' nativeContext'.
43e017ec7958 Merged with /branches/jk
vranyj1
parents: 752
diff changeset
   183
        converted := false.            
1985
7c5a14d663ba Temporary commit. JavaNativeMethod refactored to use new-style native methods.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 1974
diff changeset
   184
    ]. 
7c5a14d663ba Temporary commit. JavaNativeMethod refactored to use new-style native methods.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 1974
diff changeset
   185
7c5a14d663ba Temporary commit. JavaNativeMethod refactored to use new-style native methods.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 1974
diff changeset
   186
    header := String streamContents:[:s|
1986
9e63ab553922 JavaNativeMethod & their implementation transformed to pass a reveiver.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 1985
diff changeset
   187
        sel numArgs == 2 ifTrue:[
2010
9bacff8c53de The 'nativeContext' argument removed from all native methods.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 1993
diff changeset
   188
            s nextPutAll: sel; space; nextPutAll: 'this  '.
1985
7c5a14d663ba Temporary commit. JavaNativeMethod refactored to use new-style native methods.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 1974
diff changeset
   189
        ] ifFalse:[
7c5a14d663ba Temporary commit. JavaNativeMethod refactored to use new-style native methods.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 1974
diff changeset
   190
            | kw |
7c5a14d663ba Temporary commit. JavaNativeMethod refactored to use new-style native methods.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 1974
diff changeset
   191
2010
9bacff8c53de The 'nativeContext' argument removed from all native methods.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 1993
diff changeset
   192
            kw := sel keywords.            
1986
9e63ab553922 JavaNativeMethod & their implementation transformed to pass a reveiver.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 1985
diff changeset
   193
            s nextPutAll: kw first.
9e63ab553922 JavaNativeMethod & their implementation transformed to pass a reveiver.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 1985
diff changeset
   194
            s nextPutAll: ' this '.
9e63ab553922 JavaNativeMethod & their implementation transformed to pass a reveiver.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 1985
diff changeset
   195
            2 to: kw size - 1 do:[:i|
1985
7c5a14d663ba Temporary commit. JavaNativeMethod refactored to use new-style native methods.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 1974
diff changeset
   196
                sel nextPutAll: (kw at: i); space; nextPut:$a; nextPutAll: i printString; space.
2010
9bacff8c53de The 'nativeContext' argument removed from all native methods.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 1993
diff changeset
   197
            ].            
1985
7c5a14d663ba Temporary commit. JavaNativeMethod refactored to use new-style native methods.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 1974
diff changeset
   198
        ]
761
43e017ec7958 Merged with /branches/jk
vranyj1
parents: 752
diff changeset
   199
    ].
43e017ec7958 Merged with /branches/jk
vranyj1
parents: 752
diff changeset
   200
43e017ec7958 Merged with /branches/jk
vranyj1
parents: 752
diff changeset
   201
    (JavaVM class 
43e017ec7958 Merged with /branches/jk
vranyj1
parents: 752
diff changeset
   202
        compile:
1985
7c5a14d663ba Temporary commit. JavaNativeMethod refactored to use new-style native methods.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 1974
diff changeset
   203
            (self nativeMethodTemplate bindWith:header with: arg with: src asString)
761
43e017ec7958 Merged with /branches/jk
vranyj1
parents: 752
diff changeset
   204
        classified:         
43e017ec7958 Merged with /branches/jk
vranyj1
parents: 752
diff changeset
   205
            'native - ', ((javaClass javaPackage upTo:$$) replaceAll:$/ with:$. ))
43e017ec7958 Merged with /branches/jk
vranyj1
parents: 752
diff changeset
   206
        package: JavaVM package.
43e017ec7958 Merged with /branches/jk
vranyj1
parents: 752
diff changeset
   207
43e017ec7958 Merged with /branches/jk
vranyj1
parents: 752
diff changeset
   208
    converted ifTrue:[
43e017ec7958 Merged with /branches/jk
vranyj1
parents: 752
diff changeset
   209
        (JavaVM class compiledMethodAt: oldSel) category: 'native - old-style (converted)'
43e017ec7958 Merged with /branches/jk
vranyj1
parents: 752
diff changeset
   210
    ] ifFalse:[
43e017ec7958 Merged with /branches/jk
vranyj1
parents: 752
diff changeset
   211
       (JavaVM class compiledMethodAt: oldSel) category:  'native - old-style (FAILED to convert)'
43e017ec7958 Merged with /branches/jk
vranyj1
parents: 752
diff changeset
   212
    ]
43e017ec7958 Merged with /branches/jk
vranyj1
parents: 752
diff changeset
   213
43e017ec7958 Merged with /branches/jk
vranyj1
parents: 752
diff changeset
   214
    "Created: / 01-05-2011 / 00:08:59 / Jan Vrany <jan.vrany@fit.cvut.cz>"
1986
9e63ab553922 JavaNativeMethod & their implementation transformed to pass a reveiver.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 1985
diff changeset
   215
    "Modified: / 19-01-2013 / 23:29:59 / Jan Vrany <jan.vrany@fit.cvut.cz>"
761
43e017ec7958 Merged with /branches/jk
vranyj1
parents: 752
diff changeset
   216
!
43e017ec7958 Merged with /branches/jk
vranyj1
parents: 752
diff changeset
   217
43e017ec7958 Merged with /branches/jk
vranyj1
parents: 752
diff changeset
   218
compileNativeImplementationStub: sel
1985
7c5a14d663ba Temporary commit. JavaNativeMethod refactored to use new-style native methods.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 1974
diff changeset
   219
    | header |
761
43e017ec7958 Merged with /branches/jk
vranyj1
parents: 752
diff changeset
   220
1986
9e63ab553922 JavaNativeMethod & their implementation transformed to pass a reveiver.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 1985
diff changeset
   221
   header := String streamContents:[:s|
9e63ab553922 JavaNativeMethod & their implementation transformed to pass a reveiver.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 1985
diff changeset
   222
        sel numArgs == 2 ifTrue:[
2010
9bacff8c53de The 'nativeContext' argument removed from all native methods.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 1993
diff changeset
   223
            s nextPutAll: sel keywords first.
1985
7c5a14d663ba Temporary commit. JavaNativeMethod refactored to use new-style native methods.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 1974
diff changeset
   224
        ] ifFalse:[
7c5a14d663ba Temporary commit. JavaNativeMethod refactored to use new-style native methods.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 1974
diff changeset
   225
            | kw |
7c5a14d663ba Temporary commit. JavaNativeMethod refactored to use new-style native methods.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 1974
diff changeset
   226
2010
9bacff8c53de The 'nativeContext' argument removed from all native methods.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 1993
diff changeset
   227
            kw := sel keywords.            
1986
9e63ab553922 JavaNativeMethod & their implementation transformed to pass a reveiver.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 1985
diff changeset
   228
            s nextPutAll: kw first.
9e63ab553922 JavaNativeMethod & their implementation transformed to pass a reveiver.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 1985
diff changeset
   229
            s nextPutAll: ' this '.
9e63ab553922 JavaNativeMethod & their implementation transformed to pass a reveiver.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 1985
diff changeset
   230
            2 to: kw size - 1 do:[:i|
1990
f37fb2129089 Fixed natives. Java VM boots & Groovy 1+1 works.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 1986
diff changeset
   231
                s nextPutAll: (kw at: i); space; nextPut:$a; nextPutAll: (i - 1) printString; space.
2010
9bacff8c53de The 'nativeContext' argument removed from all native methods.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 1993
diff changeset
   232
            ].            
1985
7c5a14d663ba Temporary commit. JavaNativeMethod refactored to use new-style native methods.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 1974
diff changeset
   233
        ]
7c5a14d663ba Temporary commit. JavaNativeMethod refactored to use new-style native methods.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 1974
diff changeset
   234
    ].
7c5a14d663ba Temporary commit. JavaNativeMethod refactored to use new-style native methods.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 1974
diff changeset
   235
7c5a14d663ba Temporary commit. JavaNativeMethod refactored to use new-style native methods.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 1974
diff changeset
   236
    (JavaVM natives class 
761
43e017ec7958 Merged with /branches/jk
vranyj1
parents: 752
diff changeset
   237
        compile:
1985
7c5a14d663ba Temporary commit. JavaNativeMethod refactored to use new-style native methods.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 1974
diff changeset
   238
            (self nativeMethodTemplate bindWith:header with: 'nativeContext' with:('^ JavaVM unimplementedNativeMethodSignal raise'))
761
43e017ec7958 Merged with /branches/jk
vranyj1
parents: 752
diff changeset
   239
        classified:         
43e017ec7958 Merged with /branches/jk
vranyj1
parents: 752
diff changeset
   240
            'native - ', ((javaClass javaPackage upTo:$$) replaceAll:$/ with:$.))
43e017ec7958 Merged with /branches/jk
vranyj1
parents: 752
diff changeset
   241
        package: JavaVM package
43e017ec7958 Merged with /branches/jk
vranyj1
parents: 752
diff changeset
   242
43e017ec7958 Merged with /branches/jk
vranyj1
parents: 752
diff changeset
   243
    "Created: / 01-05-2011 / 00:08:59 / Jan Vrany <jan.vrany@fit.cvut.cz>"
1990
f37fb2129089 Fixed natives. Java VM boots & Groovy 1+1 works.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 1986
diff changeset
   244
    "Modified: / 20-01-2013 / 20:56:44 / Jan Vrany <jan.vrany@fit.cvut.cz>"
761
43e017ec7958 Merged with /branches/jk
vranyj1
parents: 752
diff changeset
   245
!
43e017ec7958 Merged with /branches/jk
vranyj1
parents: 752
diff changeset
   246
43e017ec7958 Merged with /branches/jk
vranyj1
parents: 752
diff changeset
   247
nativeMethodTemplate
43e017ec7958 Merged with /branches/jk
vranyj1
parents: 752
diff changeset
   248
43e017ec7958 Merged with /branches/jk
vranyj1
parents: 752
diff changeset
   249
    ^'%1 %2
43e017ec7958 Merged with /branches/jk
vranyj1
parents: 752
diff changeset
   250
43e017ec7958 Merged with /branches/jk
vranyj1
parents: 752
diff changeset
   251
    <javanative: ''', javaClass name , ''' name: ''', (selector copyWithoutLast:signature size), '''>
43e017ec7958 Merged with /branches/jk
vranyj1
parents: 752
diff changeset
   252
43e017ec7958 Merged with /branches/jk
vranyj1
parents: 752
diff changeset
   253
    %3'
43e017ec7958 Merged with /branches/jk
vranyj1
parents: 752
diff changeset
   254
43e017ec7958 Merged with /branches/jk
vranyj1
parents: 752
diff changeset
   255
    "Created: / 01-05-2011 / 00:12:42 / Jan Vrany <jan.vrany@fit.cvut.cz>"
1985
7c5a14d663ba Temporary commit. JavaNativeMethod refactored to use new-style native methods.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 1974
diff changeset
   256
    "Modified: / 19-01-2013 / 22:20:41 / Jan Vrany <jan.vrany@fit.cvut.cz>"
761
43e017ec7958 Merged with /branches/jk
vranyj1
parents: 752
diff changeset
   257
!
43e017ec7958 Merged with /branches/jk
vranyj1
parents: 752
diff changeset
   258
43e017ec7958 Merged with /branches/jk
vranyj1
parents: 752
diff changeset
   259
searchNativeImplementation
1986
9e63ab553922 JavaNativeMethod & their implementation transformed to pass a reveiver.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 1985
diff changeset
   260
    <resource: #obsolete>
761
43e017ec7958 Merged with /branches/jk
vranyj1
parents: 752
diff changeset
   261
43e017ec7958 Merged with /branches/jk
vranyj1
parents: 752
diff changeset
   262
    "Returns a SELECTOR of native method implementation.
43e017ec7958 Merged with /branches/jk
vranyj1
parents: 752
diff changeset
   263
    For now, two naming schemes are used. The onld one uses
43e017ec7958 Merged with /branches/jk
vranyj1
parents: 752
diff changeset
   264
    just a class name and selector as a name for native method impl.
43e017ec7958 Merged with /branches/jk
vranyj1
parents: 752
diff changeset
   265
    The new one uses fully qualified class name.
43e017ec7958 Merged with /branches/jk
vranyj1
parents: 752
diff changeset
   266
    "
43e017ec7958 Merged with /branches/jk
vranyj1
parents: 752
diff changeset
   267
43e017ec7958 Merged with /branches/jk
vranyj1
parents: 752
diff changeset
   268
    | nm newStyleSel oldStyleSel |
1986
9e63ab553922 JavaNativeMethod & their implementation transformed to pass a reveiver.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 1985
diff changeset
   269
9e63ab553922 JavaNativeMethod & their implementation transformed to pass a reveiver.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 1985
diff changeset
   270
    self error: 'Should no longer be called!!'.
9e63ab553922 JavaNativeMethod & their implementation transformed to pass a reveiver.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 1985
diff changeset
   271
912
e651488f5741 Many fixes in reflection, expecially for generic types support
vranyj1
parents: 877
diff changeset
   272
    nm := selector upTo: $(.
761
43e017ec7958 Merged with /branches/jk
vranyj1
parents: 752
diff changeset
   273
    newStyleSel := ('_' , ((javaClass name copyReplaceAll:$/ with:$_) replaceAll:$$ with:$_), '_' , nm , ':') asSymbol.    
1974
9dc799a359ac - JavaTestsLoader
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 1971
diff changeset
   274
    (JavaVM natives class canUnderstand: newStyleSel) ifTrue:[
9dc799a359ac - JavaTestsLoader
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 1971
diff changeset
   275
        "Good, a JavaVM understands new style native selectors"
9dc799a359ac - JavaTestsLoader
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 1971
diff changeset
   276
        ^newStyleSel
9dc799a359ac - JavaTestsLoader
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 1971
diff changeset
   277
    ].
761
43e017ec7958 Merged with /branches/jk
vranyj1
parents: 752
diff changeset
   278
43e017ec7958 Merged with /branches/jk
vranyj1
parents: 752
diff changeset
   279
    oldStyleSel := ('_' , (javaClass lastName copyReplaceAll:$$ with:$_) , '_' , nm , ':') asSymbol.
1974
9dc799a359ac - JavaTestsLoader
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 1971
diff changeset
   280
    (JavaVM natives canUnderstand: oldStyleSel) ifTrue:[
761
43e017ec7958 Merged with /branches/jk
vranyj1
parents: 752
diff changeset
   281
        "Convert method on the fly only if Im Jan Vrany
43e017ec7958 Merged with /branches/jk
vranyj1
parents: 752
diff changeset
   282
         (to avoid confusion of other developers :-)"
43e017ec7958 Merged with /branches/jk
vranyj1
parents: 752
diff changeset
   283
        OperatingSystem getLoginName = 'jv' ifTrue:[
43e017ec7958 Merged with /branches/jk
vranyj1
parents: 752
diff changeset
   284
            "OK, old style method has not yet been converted to a newstyle one.
43e017ec7958 Merged with /branches/jk
vranyj1
parents: 752
diff changeset
   285
            Converts old-style method to a new-style one"
43e017ec7958 Merged with /branches/jk
vranyj1
parents: 752
diff changeset
   286
            self compileNativeImplementation: newStyleSel dispatchingTo: oldStyleSel.
43e017ec7958 Merged with /branches/jk
vranyj1
parents: 752
diff changeset
   287
            ^newStyleSel
43e017ec7958 Merged with /branches/jk
vranyj1
parents: 752
diff changeset
   288
        ] ifFalse:[
43e017ec7958 Merged with /branches/jk
vranyj1
parents: 752
diff changeset
   289
            ^oldStyleSel
1974
9dc799a359ac - JavaTestsLoader
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 1971
diff changeset
   290
        ]
9dc799a359ac - JavaTestsLoader
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 1971
diff changeset
   291
    ].
761
43e017ec7958 Merged with /branches/jk
vranyj1
parents: 752
diff changeset
   292
    self compileNativeImplementationStub: newStyleSel.
43e017ec7958 Merged with /branches/jk
vranyj1
parents: 752
diff changeset
   293
    ^newStyleSel
43e017ec7958 Merged with /branches/jk
vranyj1
parents: 752
diff changeset
   294
43e017ec7958 Merged with /branches/jk
vranyj1
parents: 752
diff changeset
   295
    "Created: / 30-04-2011 / 23:50:29 / Jan Vrany <jan.vrany@fit.cvut.cz>"
1986
9e63ab553922 JavaNativeMethod & their implementation transformed to pass a reveiver.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 1985
diff changeset
   296
    "Modified: / 19-01-2013 / 23:31:20 / Jan Vrany <jan.vrany@fit.cvut.cz>"
1985
7c5a14d663ba Temporary commit. JavaNativeMethod refactored to use new-style native methods.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 1974
diff changeset
   297
!
7c5a14d663ba Temporary commit. JavaNativeMethod refactored to use new-style native methods.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 1974
diff changeset
   298
7c5a14d663ba Temporary commit. JavaNativeMethod refactored to use new-style native methods.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 1974
diff changeset
   299
searchNativeImplementation: numArgs
7c5a14d663ba Temporary commit. JavaNativeMethod refactored to use new-style native methods.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 1974
diff changeset
   300
7c5a14d663ba Temporary commit. JavaNativeMethod refactored to use new-style native methods.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 1974
diff changeset
   301
    "Returns a SELECTOR of native method implementation."
7c5a14d663ba Temporary commit. JavaNativeMethod refactored to use new-style native methods.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 1974
diff changeset
   302
7c5a14d663ba Temporary commit. JavaNativeMethod refactored to use new-style native methods.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 1974
diff changeset
   303
7c5a14d663ba Temporary commit. JavaNativeMethod refactored to use new-style native methods.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 1974
diff changeset
   304
    | nm newStyleSel args |
7c5a14d663ba Temporary commit. JavaNativeMethod refactored to use new-style native methods.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 1974
diff changeset
   305
    nm := selector upTo: $(.
7c5a14d663ba Temporary commit. JavaNativeMethod refactored to use new-style native methods.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 1974
diff changeset
   306
7c5a14d663ba Temporary commit. JavaNativeMethod refactored to use new-style native methods.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 1974
diff changeset
   307
    args := #(
2010
9bacff8c53de The 'nativeContext' argument removed from all native methods.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 1993
diff changeset
   308
        "0"  ''
9bacff8c53de The 'nativeContext' argument removed from all native methods.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 1993
diff changeset
   309
        "1"  '_:'
9bacff8c53de The 'nativeContext' argument removed from all native methods.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 1993
diff changeset
   310
        "2"  '_:_:'
9bacff8c53de The 'nativeContext' argument removed from all native methods.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 1993
diff changeset
   311
        "3"  '_:_:_:'
9bacff8c53de The 'nativeContext' argument removed from all native methods.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 1993
diff changeset
   312
        "4"  '_:_:_:_:'
9bacff8c53de The 'nativeContext' argument removed from all native methods.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 1993
diff changeset
   313
        "5"  '_:_:_:_:_:'
9bacff8c53de The 'nativeContext' argument removed from all native methods.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 1993
diff changeset
   314
        "6"  '_:_:_:_:_:_:'
9bacff8c53de The 'nativeContext' argument removed from all native methods.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 1993
diff changeset
   315
        "7"  '_:_:_:_:_:_:_:'
9bacff8c53de The 'nativeContext' argument removed from all native methods.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 1993
diff changeset
   316
        "8"  '_:_:_:_:_:_:_:_:'
9bacff8c53de The 'nativeContext' argument removed from all native methods.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 1993
diff changeset
   317
        "9"  '_:_:_:_:_:_:_:_:_:'
9bacff8c53de The 'nativeContext' argument removed from all native methods.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 1993
diff changeset
   318
        "10" '_:_:_:_:_:_:_:_:_:_:'
9bacff8c53de The 'nativeContext' argument removed from all native methods.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 1993
diff changeset
   319
        "11" '_:_:_:_:_:_:_:_:_:_:_:'
9bacff8c53de The 'nativeContext' argument removed from all native methods.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 1993
diff changeset
   320
        "12" '_:_:_:_:_:_:_:_:_:_:_:_:'
1985
7c5a14d663ba Temporary commit. JavaNativeMethod refactored to use new-style native methods.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 1974
diff changeset
   321
    ) at: numArgs + 1.
7c5a14d663ba Temporary commit. JavaNativeMethod refactored to use new-style native methods.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 1974
diff changeset
   322
1986
9e63ab553922 JavaNativeMethod & their implementation transformed to pass a reveiver.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 1985
diff changeset
   323
    newStyleSel := ('_' , ((javaClass name copyReplaceAll:$/ with:$_) replaceAll:$$ with:$_), '_' , nm , ':' , args) asSymbol.    
1985
7c5a14d663ba Temporary commit. JavaNativeMethod refactored to use new-style native methods.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 1974
diff changeset
   324
    (JavaVM natives class canUnderstand: newStyleSel) ifTrue:[
7c5a14d663ba Temporary commit. JavaNativeMethod refactored to use new-style native methods.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 1974
diff changeset
   325
        "Good, a JavaVM understands new style native selectors"
7c5a14d663ba Temporary commit. JavaNativeMethod refactored to use new-style native methods.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 1974
diff changeset
   326
        ^newStyleSel
7c5a14d663ba Temporary commit. JavaNativeMethod refactored to use new-style native methods.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 1974
diff changeset
   327
    ].
7c5a14d663ba Temporary commit. JavaNativeMethod refactored to use new-style native methods.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 1974
diff changeset
   328
7c5a14d663ba Temporary commit. JavaNativeMethod refactored to use new-style native methods.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 1974
diff changeset
   329
    self compileNativeImplementationStub: newStyleSel.
7c5a14d663ba Temporary commit. JavaNativeMethod refactored to use new-style native methods.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 1974
diff changeset
   330
    ^newStyleSel
7c5a14d663ba Temporary commit. JavaNativeMethod refactored to use new-style native methods.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 1974
diff changeset
   331
7c5a14d663ba Temporary commit. JavaNativeMethod refactored to use new-style native methods.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 1974
diff changeset
   332
    "Created: / 19-01-2013 / 22:11:40 / Jan Vrany <jan.vrany@fit.cvut.cz>"
1986
9e63ab553922 JavaNativeMethod & their implementation transformed to pass a reveiver.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 1985
diff changeset
   333
    "Modified: / 19-01-2013 / 23:39:17 / Jan Vrany <jan.vrany@fit.cvut.cz>"
761
43e017ec7958 Merged with /branches/jk
vranyj1
parents: 752
diff changeset
   334
! !
43e017ec7958 Merged with /branches/jk
vranyj1
parents: 752
diff changeset
   335
2016
6afb298c7403 Added simple trampoline methods to JavaNativeMethod.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2010
diff changeset
   336
!JavaNativeMethod methodsFor:'private-compiler interface'!
6afb298c7403 Added simple trampoline methods to JavaNativeMethod.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2010
diff changeset
   337
6afb298c7403 Added simple trampoline methods to JavaNativeMethod.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2010
diff changeset
   338
numberOfArgs:aNumber
6afb298c7403 Added simple trampoline methods to JavaNativeMethod.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2010
diff changeset
   339
    | sel m |
6afb298c7403 Added simple trampoline methods to JavaNativeMethod.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2010
diff changeset
   340
6afb298c7403 Added simple trampoline methods to JavaNativeMethod.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2010
diff changeset
   341
    super numberOfArgs:aNumber.
6afb298c7403 Added simple trampoline methods to JavaNativeMethod.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2010
diff changeset
   342
6afb298c7403 Added simple trampoline methods to JavaNativeMethod.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2010
diff changeset
   343
    (self class flags bitAnd:Behavior flagJavaMethod) ~~ 0 ifTrue:[ ^ self ].
6afb298c7403 Added simple trampoline methods to JavaNativeMethod.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2010
diff changeset
   344
6afb298c7403 Added simple trampoline methods to JavaNativeMethod.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2010
diff changeset
   345
    "Now, install the trampoline..."
6afb298c7403 Added simple trampoline methods to JavaNativeMethod.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2010
diff changeset
   346
    sel := #(
6afb298c7403 Added simple trampoline methods to JavaNativeMethod.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2010
diff changeset
   347
        "00" #trampolineUncached:
6afb298c7403 Added simple trampoline methods to JavaNativeMethod.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2010
diff changeset
   348
        "01" #trampolineUncached:
6afb298c7403 Added simple trampoline methods to JavaNativeMethod.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2010
diff changeset
   349
        "02" #trampolineUncached:_:
6afb298c7403 Added simple trampoline methods to JavaNativeMethod.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2010
diff changeset
   350
        "03" #trampolineUncached:_:_:
6afb298c7403 Added simple trampoline methods to JavaNativeMethod.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2010
diff changeset
   351
6afb298c7403 Added simple trampoline methods to JavaNativeMethod.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2010
diff changeset
   352
        "04" #trampolineUncached:_:_:_:
6afb298c7403 Added simple trampoline methods to JavaNativeMethod.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2010
diff changeset
   353
        "05" #trampolineUncached:_:_:_:_:
6afb298c7403 Added simple trampoline methods to JavaNativeMethod.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2010
diff changeset
   354
        "06" #trampolineUncached:_:_:_:_:_:
6afb298c7403 Added simple trampoline methods to JavaNativeMethod.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2010
diff changeset
   355
        "07" #trampolineUncached:_:_:_:_:_:_:
6afb298c7403 Added simple trampoline methods to JavaNativeMethod.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2010
diff changeset
   356
6afb298c7403 Added simple trampoline methods to JavaNativeMethod.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2010
diff changeset
   357
        "08" #trampolineUncached:_:_:_:_:_:_:_:
6afb298c7403 Added simple trampoline methods to JavaNativeMethod.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2010
diff changeset
   358
        "09" #trampolineUncached:_:_:_:_:_:_:_:_:
6afb298c7403 Added simple trampoline methods to JavaNativeMethod.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2010
diff changeset
   359
        "10" #trampolineUncached:_:_:_:_:_:_:_:_:_:
6afb298c7403 Added simple trampoline methods to JavaNativeMethod.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2010
diff changeset
   360
        "11" #trampolineUncached:_:_:_:_:_:_:_:_:_:_:
6afb298c7403 Added simple trampoline methods to JavaNativeMethod.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2010
diff changeset
   361
6afb298c7403 Added simple trampoline methods to JavaNativeMethod.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2010
diff changeset
   362
        "12" #trampolineUncached:_:_:_:_:_:_:_:_:_:_:_:
6afb298c7403 Added simple trampoline methods to JavaNativeMethod.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2010
diff changeset
   363
        "13" #trampolineUncached:_:_:_:_:_:_:_:_:_:_:_:_:
6afb298c7403 Added simple trampoline methods to JavaNativeMethod.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2010
diff changeset
   364
        "14" #trampolineUncached:_:_:_:_:_:_:_:_:_:_:_:_:_:
6afb298c7403 Added simple trampoline methods to JavaNativeMethod.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2010
diff changeset
   365
        "15" #trampolineUncached:_:_:_:_:_:_:_:_:_:_:_:_:_:_:
6afb298c7403 Added simple trampoline methods to JavaNativeMethod.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2010
diff changeset
   366
    ) at: aNumber + 1.
6afb298c7403 Added simple trampoline methods to JavaNativeMethod.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2010
diff changeset
   367
6afb298c7403 Added simple trampoline methods to JavaNativeMethod.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2010
diff changeset
   368
    m := self class compiledMethodAt: sel.
6afb298c7403 Added simple trampoline methods to JavaNativeMethod.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2010
diff changeset
   369
    m isNil ifTrue:[
6afb298c7403 Added simple trampoline methods to JavaNativeMethod.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2010
diff changeset
   370
        self error: 'Cannot find trampoline method'.
6afb298c7403 Added simple trampoline methods to JavaNativeMethod.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2010
diff changeset
   371
    ].
6afb298c7403 Added simple trampoline methods to JavaNativeMethod.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2010
diff changeset
   372
    self byteCode: m byteCode.
6afb298c7403 Added simple trampoline methods to JavaNativeMethod.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2010
diff changeset
   373
6afb298c7403 Added simple trampoline methods to JavaNativeMethod.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2010
diff changeset
   374
    "Created: / 31-01-2013 / 12:44:16 / Jan Vrany <jan.vrany@fit.cvut.cz>"
6afb298c7403 Added simple trampoline methods to JavaNativeMethod.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2010
diff changeset
   375
! !
6afb298c7403 Added simple trampoline methods to JavaNativeMethod.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2010
diff changeset
   376
6afb298c7403 Added simple trampoline methods to JavaNativeMethod.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2010
diff changeset
   377
!JavaNativeMethod methodsFor:'private-trampolines'!
6afb298c7403 Added simple trampoline methods to JavaNativeMethod.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2010
diff changeset
   378
6afb298c7403 Added simple trampoline methods to JavaNativeMethod.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2010
diff changeset
   379
trampolineUncached
6afb298c7403 Added simple trampoline methods to JavaNativeMethod.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2010
diff changeset
   380
    ^self nativeMethodInvokation: thisContext.
6afb298c7403 Added simple trampoline methods to JavaNativeMethod.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2010
diff changeset
   381
6afb298c7403 Added simple trampoline methods to JavaNativeMethod.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2010
diff changeset
   382
    "Created: / 31-01-2013 / 12:55:02 / Jan Vrany <jan.vrany@fit.cvut.cz>"
6afb298c7403 Added simple trampoline methods to JavaNativeMethod.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2010
diff changeset
   383
!
6afb298c7403 Added simple trampoline methods to JavaNativeMethod.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2010
diff changeset
   384
6afb298c7403 Added simple trampoline methods to JavaNativeMethod.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2010
diff changeset
   385
trampolineUncached: a1
6afb298c7403 Added simple trampoline methods to JavaNativeMethod.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2010
diff changeset
   386
    ^self nativeMethodInvokation: thisContext.
6afb298c7403 Added simple trampoline methods to JavaNativeMethod.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2010
diff changeset
   387
6afb298c7403 Added simple trampoline methods to JavaNativeMethod.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2010
diff changeset
   388
    "Created: / 31-01-2013 / 12:55:20 / Jan Vrany <jan.vrany@fit.cvut.cz>"
6afb298c7403 Added simple trampoline methods to JavaNativeMethod.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2010
diff changeset
   389
!
6afb298c7403 Added simple trampoline methods to JavaNativeMethod.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2010
diff changeset
   390
6afb298c7403 Added simple trampoline methods to JavaNativeMethod.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2010
diff changeset
   391
trampolineUncached: a1 _: a2
6afb298c7403 Added simple trampoline methods to JavaNativeMethod.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2010
diff changeset
   392
    ^self nativeMethodInvokation: thisContext.
6afb298c7403 Added simple trampoline methods to JavaNativeMethod.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2010
diff changeset
   393
6afb298c7403 Added simple trampoline methods to JavaNativeMethod.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2010
diff changeset
   394
    "Created: / 31-01-2013 / 12:55:26 / Jan Vrany <jan.vrany@fit.cvut.cz>"
6afb298c7403 Added simple trampoline methods to JavaNativeMethod.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2010
diff changeset
   395
!
6afb298c7403 Added simple trampoline methods to JavaNativeMethod.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2010
diff changeset
   396
6afb298c7403 Added simple trampoline methods to JavaNativeMethod.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2010
diff changeset
   397
trampolineUncached: a1 _: a2 _: a3
6afb298c7403 Added simple trampoline methods to JavaNativeMethod.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2010
diff changeset
   398
    ^self nativeMethodInvokation: thisContext.
6afb298c7403 Added simple trampoline methods to JavaNativeMethod.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2010
diff changeset
   399
6afb298c7403 Added simple trampoline methods to JavaNativeMethod.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2010
diff changeset
   400
    "Created: / 31-01-2013 / 12:55:34 / Jan Vrany <jan.vrany@fit.cvut.cz>"
6afb298c7403 Added simple trampoline methods to JavaNativeMethod.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2010
diff changeset
   401
!
6afb298c7403 Added simple trampoline methods to JavaNativeMethod.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2010
diff changeset
   402
6afb298c7403 Added simple trampoline methods to JavaNativeMethod.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2010
diff changeset
   403
trampolineUncached: a1 _: a2 _: a3 _: a4
6afb298c7403 Added simple trampoline methods to JavaNativeMethod.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2010
diff changeset
   404
    ^self nativeMethodInvokation: thisContext.
6afb298c7403 Added simple trampoline methods to JavaNativeMethod.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2010
diff changeset
   405
6afb298c7403 Added simple trampoline methods to JavaNativeMethod.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2010
diff changeset
   406
    "Created: / 31-01-2013 / 12:55:47 / Jan Vrany <jan.vrany@fit.cvut.cz>"
6afb298c7403 Added simple trampoline methods to JavaNativeMethod.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2010
diff changeset
   407
!
6afb298c7403 Added simple trampoline methods to JavaNativeMethod.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2010
diff changeset
   408
6afb298c7403 Added simple trampoline methods to JavaNativeMethod.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2010
diff changeset
   409
trampolineUncached: a1 _: a2 _: a3 _: a4 _: a5
6afb298c7403 Added simple trampoline methods to JavaNativeMethod.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2010
diff changeset
   410
    ^self nativeMethodInvokation: thisContext.
6afb298c7403 Added simple trampoline methods to JavaNativeMethod.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2010
diff changeset
   411
6afb298c7403 Added simple trampoline methods to JavaNativeMethod.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2010
diff changeset
   412
    "Created: / 31-01-2013 / 12:55:50 / Jan Vrany <jan.vrany@fit.cvut.cz>"
6afb298c7403 Added simple trampoline methods to JavaNativeMethod.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2010
diff changeset
   413
!
6afb298c7403 Added simple trampoline methods to JavaNativeMethod.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2010
diff changeset
   414
6afb298c7403 Added simple trampoline methods to JavaNativeMethod.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2010
diff changeset
   415
trampolineUncached: a1 _: a2 _: a3 _: a4 _: a5 _: a6
6afb298c7403 Added simple trampoline methods to JavaNativeMethod.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2010
diff changeset
   416
    ^self nativeMethodInvokation: thisContext.
6afb298c7403 Added simple trampoline methods to JavaNativeMethod.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2010
diff changeset
   417
6afb298c7403 Added simple trampoline methods to JavaNativeMethod.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2010
diff changeset
   418
    "Created: / 31-01-2013 / 12:55:53 / Jan Vrany <jan.vrany@fit.cvut.cz>"
6afb298c7403 Added simple trampoline methods to JavaNativeMethod.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2010
diff changeset
   419
!
6afb298c7403 Added simple trampoline methods to JavaNativeMethod.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2010
diff changeset
   420
6afb298c7403 Added simple trampoline methods to JavaNativeMethod.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2010
diff changeset
   421
trampolineUncached: a1 _: a2 _: a3 _: a4 _: a5 _: a6 _: a7
6afb298c7403 Added simple trampoline methods to JavaNativeMethod.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2010
diff changeset
   422
    ^self nativeMethodInvokation: thisContext.
6afb298c7403 Added simple trampoline methods to JavaNativeMethod.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2010
diff changeset
   423
6afb298c7403 Added simple trampoline methods to JavaNativeMethod.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2010
diff changeset
   424
    "Created: / 31-01-2013 / 12:55:55 / Jan Vrany <jan.vrany@fit.cvut.cz>"
6afb298c7403 Added simple trampoline methods to JavaNativeMethod.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2010
diff changeset
   425
!
6afb298c7403 Added simple trampoline methods to JavaNativeMethod.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2010
diff changeset
   426
6afb298c7403 Added simple trampoline methods to JavaNativeMethod.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2010
diff changeset
   427
trampolineUncached: a1 _: a2 _: a3 _: a4 _: a5 _: a6 _: a7 _: a8
6afb298c7403 Added simple trampoline methods to JavaNativeMethod.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2010
diff changeset
   428
    ^self nativeMethodInvokation: thisContext.
6afb298c7403 Added simple trampoline methods to JavaNativeMethod.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2010
diff changeset
   429
6afb298c7403 Added simple trampoline methods to JavaNativeMethod.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2010
diff changeset
   430
    "Created: / 31-01-2013 / 12:56:00 / Jan Vrany <jan.vrany@fit.cvut.cz>"
6afb298c7403 Added simple trampoline methods to JavaNativeMethod.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2010
diff changeset
   431
!
6afb298c7403 Added simple trampoline methods to JavaNativeMethod.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2010
diff changeset
   432
6afb298c7403 Added simple trampoline methods to JavaNativeMethod.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2010
diff changeset
   433
trampolineUncached: a1 _: a2 _: a3 _: a4 _: a5 _: a6 _: a7 _: a8 _: a9
6afb298c7403 Added simple trampoline methods to JavaNativeMethod.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2010
diff changeset
   434
    ^self nativeMethodInvokation: thisContext.
6afb298c7403 Added simple trampoline methods to JavaNativeMethod.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2010
diff changeset
   435
6afb298c7403 Added simple trampoline methods to JavaNativeMethod.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2010
diff changeset
   436
    "Created: / 31-01-2013 / 12:56:03 / Jan Vrany <jan.vrany@fit.cvut.cz>"
6afb298c7403 Added simple trampoline methods to JavaNativeMethod.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2010
diff changeset
   437
!
6afb298c7403 Added simple trampoline methods to JavaNativeMethod.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2010
diff changeset
   438
6afb298c7403 Added simple trampoline methods to JavaNativeMethod.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2010
diff changeset
   439
trampolineUncached: a1 _: a2 _: a3 _: a4 _: a5 _: a6 _: a7 _: a8 _: a9 _: a10
6afb298c7403 Added simple trampoline methods to JavaNativeMethod.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2010
diff changeset
   440
    ^self nativeMethodInvokation: thisContext.
6afb298c7403 Added simple trampoline methods to JavaNativeMethod.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2010
diff changeset
   441
6afb298c7403 Added simple trampoline methods to JavaNativeMethod.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2010
diff changeset
   442
    "Created: / 31-01-2013 / 12:56:08 / Jan Vrany <jan.vrany@fit.cvut.cz>"
6afb298c7403 Added simple trampoline methods to JavaNativeMethod.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2010
diff changeset
   443
!
6afb298c7403 Added simple trampoline methods to JavaNativeMethod.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2010
diff changeset
   444
6afb298c7403 Added simple trampoline methods to JavaNativeMethod.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2010
diff changeset
   445
trampolineUncached: a1 _: a2 _: a3 _: a4 _: a5 _: a6 _: a7 _: a8 _: a9 _: a10 _: a11
6afb298c7403 Added simple trampoline methods to JavaNativeMethod.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2010
diff changeset
   446
    ^self nativeMethodInvokation: thisContext.
6afb298c7403 Added simple trampoline methods to JavaNativeMethod.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2010
diff changeset
   447
6afb298c7403 Added simple trampoline methods to JavaNativeMethod.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2010
diff changeset
   448
    "Created: / 31-01-2013 / 12:56:10 / Jan Vrany <jan.vrany@fit.cvut.cz>"
6afb298c7403 Added simple trampoline methods to JavaNativeMethod.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2010
diff changeset
   449
!
6afb298c7403 Added simple trampoline methods to JavaNativeMethod.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2010
diff changeset
   450
6afb298c7403 Added simple trampoline methods to JavaNativeMethod.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2010
diff changeset
   451
trampolineUncached: a1 _: a2 _: a3 _: a4 _: a5 _: a6 _: a7 _: a8 _: a9 _: a10 _: a11 _: a12
6afb298c7403 Added simple trampoline methods to JavaNativeMethod.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2010
diff changeset
   452
    ^self nativeMethodInvokation: thisContext.
6afb298c7403 Added simple trampoline methods to JavaNativeMethod.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2010
diff changeset
   453
6afb298c7403 Added simple trampoline methods to JavaNativeMethod.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2010
diff changeset
   454
    "Created: / 31-01-2013 / 12:56:15 / Jan Vrany <jan.vrany@fit.cvut.cz>"
6afb298c7403 Added simple trampoline methods to JavaNativeMethod.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2010
diff changeset
   455
!
6afb298c7403 Added simple trampoline methods to JavaNativeMethod.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2010
diff changeset
   456
6afb298c7403 Added simple trampoline methods to JavaNativeMethod.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2010
diff changeset
   457
trampolineUncached: a1 _: a2 _: a3 _: a4 _: a5 _: a6 _: a7 _: a8 _: a9 _: a10 _: a11 _: a12 _: a13
6afb298c7403 Added simple trampoline methods to JavaNativeMethod.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2010
diff changeset
   458
    ^self nativeMethodInvokation: thisContext.
6afb298c7403 Added simple trampoline methods to JavaNativeMethod.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2010
diff changeset
   459
6afb298c7403 Added simple trampoline methods to JavaNativeMethod.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2010
diff changeset
   460
    "Created: / 31-01-2013 / 12:56:22 / Jan Vrany <jan.vrany@fit.cvut.cz>"
6afb298c7403 Added simple trampoline methods to JavaNativeMethod.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2010
diff changeset
   461
!
6afb298c7403 Added simple trampoline methods to JavaNativeMethod.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2010
diff changeset
   462
6afb298c7403 Added simple trampoline methods to JavaNativeMethod.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2010
diff changeset
   463
trampolineUncached: a1 _: a2 _: a3 _: a4 _: a5 _: a6 _: a7 _: a8 _: a9 _: a10 _: a11 _: a12 _: a13 _: a14
6afb298c7403 Added simple trampoline methods to JavaNativeMethod.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2010
diff changeset
   464
    ^self nativeMethodInvokation: thisContext.
6afb298c7403 Added simple trampoline methods to JavaNativeMethod.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2010
diff changeset
   465
6afb298c7403 Added simple trampoline methods to JavaNativeMethod.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2010
diff changeset
   466
    "Created: / 31-01-2013 / 12:56:48 / Jan Vrany <jan.vrany@fit.cvut.cz>"
6afb298c7403 Added simple trampoline methods to JavaNativeMethod.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2010
diff changeset
   467
!
6afb298c7403 Added simple trampoline methods to JavaNativeMethod.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2010
diff changeset
   468
6afb298c7403 Added simple trampoline methods to JavaNativeMethod.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2010
diff changeset
   469
trampolineUncached: a1 _: a2 _: a3 _: a4 _: a5 _: a6 _: a7 _: a8 _: a9 _: a10 _: a11 _: a12 _: a13 _: a14 _: a15
6afb298c7403 Added simple trampoline methods to JavaNativeMethod.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2010
diff changeset
   470
    ^self nativeMethodInvokation: thisContext.
6afb298c7403 Added simple trampoline methods to JavaNativeMethod.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2010
diff changeset
   471
6afb298c7403 Added simple trampoline methods to JavaNativeMethod.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2010
diff changeset
   472
    "Created: / 31-01-2013 / 12:56:36 / Jan Vrany <jan.vrany@fit.cvut.cz>"
6afb298c7403 Added simple trampoline methods to JavaNativeMethod.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2010
diff changeset
   473
! !
6afb298c7403 Added simple trampoline methods to JavaNativeMethod.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2010
diff changeset
   474
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   475
!JavaNativeMethod methodsFor:'vm support'!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   476
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   477
nativeMethodInvokation
761
43e017ec7958 Merged with /branches/jk
vranyj1
parents: 752
diff changeset
   478
    "Called by the VM when a native method is
1748
ff89096bf12f - JavaNativeMethod
vranyj1
parents: 1213
diff changeset
   479
     to be executed - old (slow) implementation"
ff89096bf12f - JavaNativeMethod
vranyj1
parents: 1213
diff changeset
   480
ff89096bf12f - JavaNativeMethod
vranyj1
parents: 1213
diff changeset
   481
    ^self nativeMethodInvokation: thisContext sender.    
ff89096bf12f - JavaNativeMethod
vranyj1
parents: 1213
diff changeset
   482
ff89096bf12f - JavaNativeMethod
vranyj1
parents: 1213
diff changeset
   483
    "
ff89096bf12f - JavaNativeMethod
vranyj1
parents: 1213
diff changeset
   484
     JavaNativeMethod flushAllCachedNativeMethods"
ff89096bf12f - JavaNativeMethod
vranyj1
parents: 1213
diff changeset
   485
ff89096bf12f - JavaNativeMethod
vranyj1
parents: 1213
diff changeset
   486
    "Modified: / 27-01-2000 / 13:34:53 / cg"
ff89096bf12f - JavaNativeMethod
vranyj1
parents: 1213
diff changeset
   487
    "Modified: / 03-11-2011 / 10:47:48 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
ff89096bf12f - JavaNativeMethod
vranyj1
parents: 1213
diff changeset
   488
    "Modified: / 27-10-2012 / 15:15:54 / Jan Vrany <jan.vrany@fit.cvut.cz>"
ff89096bf12f - JavaNativeMethod
vranyj1
parents: 1213
diff changeset
   489
!
ff89096bf12f - JavaNativeMethod
vranyj1
parents: 1213
diff changeset
   490
ff89096bf12f - JavaNativeMethod
vranyj1
parents: 1213
diff changeset
   491
nativeMethodInvokation: context
ff89096bf12f - JavaNativeMethod
vranyj1
parents: 1213
diff changeset
   492
    "Called by the VM when a native method is
ff89096bf12f - JavaNativeMethod
vranyj1
parents: 1213
diff changeset
   493
     to be executed. 
ff89096bf12f - JavaNativeMethod
vranyj1
parents: 1213
diff changeset
   494
ff89096bf12f - JavaNativeMethod
vranyj1
parents: 1213
diff changeset
   495
     'context' is the context of being-invoked native method"
1073
e842ab17fe16 quite big class loaders rewrite.. javavm/groovy boots, almost all tests pass.. hope you will like it..
hlopkmar
parents: 1022
diff changeset
   496
    
1986
9e63ab553922 JavaNativeMethod & their implementation transformed to pass a reveiver.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 1985
diff changeset
   497
    | sel  mthd  sender nArgs receiverAndArgsAndContext |
1749
2a942f354a94 - JavaNativeMethod
vranyj1
parents: 1748
diff changeset
   498
    nCalls := (nCalls ? 0) + 1.
2010
9bacff8c53de The 'nativeContext' argument removed from all native methods.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 1993
diff changeset
   499
    receiverAndArgsAndContext := Array new: (nArgs := context numArgs) + 1"receiver".
1993
6cb676a913a8 Native methods now use arguments instead of fetching them from context.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 1990
diff changeset
   500
    receiverAndArgsAndContext replaceFrom:2 to:1 + nArgs with: context startingAt: context arg1Index.
1986
9e63ab553922 JavaNativeMethod & their implementation transformed to pass a reveiver.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 1985
diff changeset
   501
    receiverAndArgsAndContext at: 1 put: context receiver.
2010
9bacff8c53de The 'nativeContext' argument removed from all native methods.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 1993
diff changeset
   502
    
1985
7c5a14d663ba Temporary commit. JavaNativeMethod refactored to use new-style native methods.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 1974
diff changeset
   503
7c5a14d663ba Temporary commit. JavaNativeMethod refactored to use new-style native methods.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 1974
diff changeset
   504
1073
e842ab17fe16 quite big class loaders rewrite.. javavm/groovy boots, almost all tests pass.. hope you will like it..
hlopkmar
parents: 1022
diff changeset
   505
    (mthd := nativeImplementation) isNil ifTrue: [
1985
7c5a14d663ba Temporary commit. JavaNativeMethod refactored to use new-style native methods.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 1974
diff changeset
   506
        sel := self searchNativeImplementation: nArgs.
1971
e75c1790521c Java native implementation refactoring (phase 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 1864
diff changeset
   507
        mthd := (JavaVM natives class compiledMethodAt: sel).
1073
e842ab17fe16 quite big class loaders rewrite.. javavm/groovy boots, almost all tests pass.. hope you will like it..
hlopkmar
parents: 1022
diff changeset
   508
        (mthd isNil or: [ mthd isLazyMethod ]) ifTrue: [
1748
ff89096bf12f - JavaNativeMethod
vranyj1
parents: 1213
diff changeset
   509
            sender := context.
1073
e842ab17fe16 quite big class loaders rewrite.. javavm/groovy boots, almost all tests pass.. hope you will like it..
hlopkmar
parents: 1022
diff changeset
   510
            sender sender selector == #noByteCode ifTrue: [
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   511
                sender := sender sender.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   512
                sender := sender sender.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   513
                sender := sender sender.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   514
            ].
1986
9e63ab553922 JavaNativeMethod & their implementation transformed to pass a reveiver.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 1985
diff changeset
   515
            ^ JavaVM natives perform: sel withArguments: receiverAndArgsAndContext 
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   516
        ].
1073
e842ab17fe16 quite big class loaders rewrite.. javavm/groovy boots, almost all tests pass.. hope you will like it..
hlopkmar
parents: 1022
diff changeset
   517
        CacheNativeImplementation ifTrue: [ nativeImplementation := mthd. ]
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   518
    ].
1075
927aeb3649fc Fix in native method imp -> class loading java tests all pass.. I'm getting drunk tonight :)
hlopkmar
parents: 1073
diff changeset
   519
    Verbose ifTrue: [Logger log: 'Native method invokation: ' , sel severity: #debug facility: #JVM].
1073
e842ab17fe16 quite big class loaders rewrite.. javavm/groovy boots, almost all tests pass.. hope you will like it..
hlopkmar
parents: 1022
diff changeset
   520
    ^ mthd 
1971
e75c1790521c Java native implementation refactoring (phase 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 1864
diff changeset
   521
        valueWithReceiver: JavaVM natives
1986
9e63ab553922 JavaNativeMethod & their implementation transformed to pass a reveiver.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 1985
diff changeset
   522
        arguments: receiverAndArgsAndContext 
1073
e842ab17fe16 quite big class loaders rewrite.. javavm/groovy boots, almost all tests pass.. hope you will like it..
hlopkmar
parents: 1022
diff changeset
   523
        selector: selector
1971
e75c1790521c Java native implementation refactoring (phase 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 1864
diff changeset
   524
        search: JavaVM natives class
1073
e842ab17fe16 quite big class loaders rewrite.. javavm/groovy boots, almost all tests pass.. hope you will like it..
hlopkmar
parents: 1022
diff changeset
   525
        sender: nil
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   526
1073
e842ab17fe16 quite big class loaders rewrite.. javavm/groovy boots, almost all tests pass.. hope you will like it..
hlopkmar
parents: 1022
diff changeset
   527
    "
e842ab17fe16 quite big class loaders rewrite.. javavm/groovy boots, almost all tests pass.. hope you will like it..
hlopkmar
parents: 1022
diff changeset
   528
     JavaNativeMethod flushAllCachedNativeMethods"
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   529
1748
ff89096bf12f - JavaNativeMethod
vranyj1
parents: 1213
diff changeset
   530
    "Created: / 27-10-2012 / 15:13:35 / Jan Vrany <jan.vrany@fit.cvut.cz>"
1993
6cb676a913a8 Native methods now use arguments instead of fetching them from context.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 1990
diff changeset
   531
    "Modified: / 21-01-2013 / 17:35:27 / Jan Vrany <jan.vrany@fit.cvut.cz>"
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   532
! !
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   533
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   534
!JavaNativeMethod class methodsFor:'documentation'!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   535
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   536
version
1864
60a8dc26c8c6 Updated from HG
vranyj1
parents: 1818
diff changeset
   537
    ^ '$Header$'
60a8dc26c8c6 Updated from HG
vranyj1
parents: 1818
diff changeset
   538
!
60a8dc26c8c6 Updated from HG
vranyj1
parents: 1818
diff changeset
   539
60a8dc26c8c6 Updated from HG
vranyj1
parents: 1818
diff changeset
   540
version_HG
60a8dc26c8c6 Updated from HG
vranyj1
parents: 1818
diff changeset
   541
60a8dc26c8c6 Updated from HG
vranyj1
parents: 1818
diff changeset
   542
    ^ '$Changeset: <not expanded> $'
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   543
!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   544
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   545
version_SVN
1864
60a8dc26c8c6 Updated from HG
vranyj1
parents: 1818
diff changeset
   546
    ^ '§Id§'
923
b922537eea2a Merged with CVS version
vranyj1
parents: 912
diff changeset
   547
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   548
! !
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   549
1985
7c5a14d663ba Temporary commit. JavaNativeMethod refactored to use new-style native methods.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 1974
diff changeset
   550
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   551
JavaNativeMethod initialize!