JavaMethodRef2.st
author Jan Vrany <jan.vrany@fit.cvut.cz>
Sun, 16 Dec 2012 21:04:02 +0100
branchdirectory_structure_refactoring
changeset 1899 800c0f76adce
parent 1818 2e5ed72e7dfd
child 1864 60a8dc26c8c6
permissions -rw-r--r--
Closing branch directory_structure_refactoring
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
877
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 850
diff changeset
     1
"
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 850
diff changeset
     2
 COPYRIGHT (c) 1996-2011 by Claus Gittinger
1152
040cba55a7d2 Copyright fixes
vranyj1
parents: 877
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: 877
diff changeset
     5
877
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 850
diff changeset
     6
 COPYRIGHT (c) 2010-2011 by Jan Vrany, Jan Kurs and Marcel Hlopko
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 850
diff changeset
     7
                            SWING Research Group, Czech Technical University in Prague
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 850
diff changeset
     8
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 850
diff changeset
     9
 This software is furnished under a license and may be used
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 850
diff changeset
    10
 only in accordance with the terms of that license and with the
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 850
diff changeset
    11
 inclusion of the above copyright notice.   This software may not
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 850
diff changeset
    12
 be provided or otherwise made available to, or used by, any
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 850
diff changeset
    13
 other person.  No title to or ownership of the software is
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 850
diff changeset
    14
 hereby transferred.
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 850
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: 877
diff changeset
    19
     as of 1.9.2010
877
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 850
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
JavaClassContentRef2 subclass:#JavaMethodRef2
1728
0d275432230d - JavaRef2
vranyj1
parents: 1655
diff changeset
    24
	instanceVariableNames:'selectorCache numArgSlotsCache returnTypeCache'
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    25
	classVariableNames:''
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-Reader-Support-new'
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: 850
diff changeset
    30
!JavaMethodRef2 class methodsFor:'documentation'!
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 850
diff changeset
    31
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 850
diff changeset
    32
copyright
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 850
diff changeset
    33
"
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 850
diff changeset
    34
 COPYRIGHT (c) 1996-2011 by Claus Gittinger
1152
040cba55a7d2 Copyright fixes
vranyj1
parents: 877
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: 877
diff changeset
    37
877
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 850
diff changeset
    38
 COPYRIGHT (c) 2010-2011 by Jan Vrany, Jan Kurs and Marcel Hlopko
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 850
diff changeset
    39
                            SWING Research Group, Czech Technical University in Prague
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 850
diff changeset
    40
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 850
diff changeset
    41
 This software is furnished under a license and may be used
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 850
diff changeset
    42
 only in accordance with the terms of that license and with the
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 850
diff changeset
    43
 inclusion of the above copyright notice.   This software may not
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 850
diff changeset
    44
 be provided or otherwise made available to, or used by, any
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 850
diff changeset
    45
 other person.  No title to or ownership of the software is
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 850
diff changeset
    46
 hereby transferred.
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 850
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: 877
diff changeset
    51
     as of 1.9.2010
877
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 850
diff changeset
    52
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 850
diff changeset
    53
"
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 850
diff changeset
    54
! !
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    55
850
160c389771a6 Fixes in resolving methodrefs for array methods
vranyj1
parents: 794
diff changeset
    56
!JavaMethodRef2 methodsFor:'printing & storing'!
160c389771a6 Fixes in resolving methodrefs for array methods
vranyj1
parents: 794
diff changeset
    57
160c389771a6 Fixes in resolving methodrefs for array methods
vranyj1
parents: 794
diff changeset
    58
printOn:aStream
160c389771a6 Fixes in resolving methodrefs for array methods
vranyj1
parents: 794
diff changeset
    59
    "append a printed representation if the receiver to the argument, aStream"
160c389771a6 Fixes in resolving methodrefs for array methods
vranyj1
parents: 794
diff changeset
    60
160c389771a6 Fixes in resolving methodrefs for array methods
vranyj1
parents: 794
diff changeset
    61
    super printOn:aStream.
160c389771a6 Fixes in resolving methodrefs for array methods
vranyj1
parents: 794
diff changeset
    62
! !
160c389771a6 Fixes in resolving methodrefs for array methods
vranyj1
parents: 794
diff changeset
    63
758
be8e84381ce0 Merged with /branches/jk
vranyj1
parents: 752
diff changeset
    64
!JavaMethodRef2 methodsFor:'private - resolving'!
be8e84381ce0 Merged with /branches/jk
vranyj1
parents: 752
diff changeset
    65
761
43e017ec7958 Merged with /branches/jk
vranyj1
parents: 758
diff changeset
    66
findResolvedStaticValue
1238
c7cddd513da6 Few fixes for Tomcat
vranyj1
parents: 1235
diff changeset
    67
    <resource: #obsolete>
c7cddd513da6 Few fixes for Tomcat
vranyj1
parents: 1235
diff changeset
    68
"/    Logger 
c7cddd513da6 Few fixes for Tomcat
vranyj1
parents: 1235
diff changeset
    69
"/        log: self printString 
c7cddd513da6 Few fixes for Tomcat
vranyj1
parents: 1235
diff changeset
    70
"/                , ': findResolvedStaticValue is obsolete, call resolve its safe :)'
c7cddd513da6 Few fixes for Tomcat
vranyj1
parents: 1235
diff changeset
    71
"/        severity: #info
c7cddd513da6 Few fixes for Tomcat
vranyj1
parents: 1235
diff changeset
    72
"/        facility: #JVM.
1235
8a3b56d4ba26 method resolving unified.. fields to follow
hlopkmar
parents: 1155
diff changeset
    73
    self findResolvedValue.
761
43e017ec7958 Merged with /branches/jk
vranyj1
parents: 758
diff changeset
    74
43e017ec7958 Merged with /branches/jk
vranyj1
parents: 758
diff changeset
    75
    "Created: / 28-04-2011 / 22:45:53 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
1235
8a3b56d4ba26 method resolving unified.. fields to follow
hlopkmar
parents: 1155
diff changeset
    76
    "Modified: / 07-12-2011 / 15:10:51 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
1238
c7cddd513da6 Few fixes for Tomcat
vranyj1
parents: 1235
diff changeset
    77
    "Modified: / 07-12-2011 / 21:07:31 / Jan Vrany <jan.vrany@fit.cvut.cz>"
761
43e017ec7958 Merged with /branches/jk
vranyj1
parents: 758
diff changeset
    78
!
43e017ec7958 Merged with /branches/jk
vranyj1
parents: 758
diff changeset
    79
1353
2968f8acb434 one step closer to eager method resolving
hlopkmar
parents: 1238
diff changeset
    80
findResolvedValue: doClassInit
761
43e017ec7958 Merged with /branches/jk
vranyj1
parents: 758
diff changeset
    81
    "Resolve reference and set valueCache."
43e017ec7958 Merged with /branches/jk
vranyj1
parents: 758
diff changeset
    82
    
43e017ec7958 Merged with /branches/jk
vranyj1
parents: 758
diff changeset
    83
    valueCache := JavaResolver uniqueInstance 
794
9635f32d1723 implemented deeper caching in new resolving refs to help keeping C-code lean and clean
hlopkmar
parents: 772
diff changeset
    84
                resolveMethodIndentifiedByRef: self.
1353
2968f8acb434 one step closer to eager method resolving
hlopkmar
parents: 1238
diff changeset
    85
    classCache := (constantPool at: classRefIndex) resolve: doClassInit.
1655
340244702a94 - JavaMethodRef2
vranyj1
parents: 1353
diff changeset
    86
    classCache isNil ifTrue: [ self breakPoint: #mh ].
794
9635f32d1723 implemented deeper caching in new resolving refs to help keeping C-code lean and clean
hlopkmar
parents: 772
diff changeset
    87
    nameAndTypeCache := (constantPool at: nameAndTypeIndex) resolve.
1655
340244702a94 - JavaMethodRef2
vranyj1
parents: 1353
diff changeset
    88
    nameAndTypeCache isNil ifTrue: [ self breakPoint: #mh ].
340244702a94 - JavaMethodRef2
vranyj1
parents: 1353
diff changeset
    89
    selectorCache isNil ifTrue: [
340244702a94 - JavaMethodRef2
vranyj1
parents: 1353
diff changeset
    90
        selectorCache := (nameAndTypeCache name , nameAndTypeCache descriptor) asSymbol
340244702a94 - JavaMethodRef2
vranyj1
parents: 1353
diff changeset
    91
    ].
758
be8e84381ce0 Merged with /branches/jk
vranyj1
parents: 752
diff changeset
    92
794
9635f32d1723 implemented deeper caching in new resolving refs to help keeping C-code lean and clean
hlopkmar
parents: 772
diff changeset
    93
    "Modified: / 18-05-2011 / 12:44:07 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
1353
2968f8acb434 one step closer to eager method resolving
hlopkmar
parents: 1238
diff changeset
    94
    "Created: / 09-02-2012 / 23:10:32 / mh <hlopik@gmail.com>"
1655
340244702a94 - JavaMethodRef2
vranyj1
parents: 1353
diff changeset
    95
    "Modified: / 22-08-2012 / 14:53:38 / Jan Vrany <jan.vrany@fit.cvut.cz>"
761
43e017ec7958 Merged with /branches/jk
vranyj1
parents: 758
diff changeset
    96
! !
43e017ec7958 Merged with /branches/jk
vranyj1
parents: 758
diff changeset
    97
43e017ec7958 Merged with /branches/jk
vranyj1
parents: 758
diff changeset
    98
!JavaMethodRef2 methodsFor:'queries'!
43e017ec7958 Merged with /branches/jk
vranyj1
parents: 758
diff changeset
    99
43e017ec7958 Merged with /branches/jk
vranyj1
parents: 758
diff changeset
   100
isJavaMethodRef
43e017ec7958 Merged with /branches/jk
vranyj1
parents: 758
diff changeset
   101
^ true.
43e017ec7958 Merged with /branches/jk
vranyj1
parents: 758
diff changeset
   102
43e017ec7958 Merged with /branches/jk
vranyj1
parents: 758
diff changeset
   103
    "Created: / 11-04-2011 / 19:56:35 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
758
be8e84381ce0 Merged with /branches/jk
vranyj1
parents: 752
diff changeset
   104
! !
be8e84381ce0 Merged with /branches/jk
vranyj1
parents: 752
diff changeset
   105
1728
0d275432230d - JavaRef2
vranyj1
parents: 1655
diff changeset
   106
!JavaMethodRef2 methodsFor:'resolving'!
0d275432230d - JavaRef2
vranyj1
parents: 1655
diff changeset
   107
0d275432230d - JavaRef2
vranyj1
parents: 1655
diff changeset
   108
preResolve
0d275432230d - JavaRef2
vranyj1
parents: 1655
diff changeset
   109
    "Fill in selectorCache and numArgSlotsCache for these are used
0d275432230d - JavaRef2
vranyj1
parents: 1655
diff changeset
   110
     by the JIT-compiler"
0d275432230d - JavaRef2
vranyj1
parents: 1655
diff changeset
   111
0d275432230d - JavaRef2
vranyj1
parents: 1655
diff changeset
   112
    | returnTypeChar |
0d275432230d - JavaRef2
vranyj1
parents: 1655
diff changeset
   113
0d275432230d - JavaRef2
vranyj1
parents: 1655
diff changeset
   114
    nameAndTypeCache := (constantPool at: nameAndTypeIndex) resolve.
0d275432230d - JavaRef2
vranyj1
parents: 1655
diff changeset
   115
    nameAndTypeCache isNil ifTrue: [ self breakPoint: #mh ].
0d275432230d - JavaRef2
vranyj1
parents: 1655
diff changeset
   116
    selectorCache isNil ifTrue: [
0d275432230d - JavaRef2
vranyj1
parents: 1655
diff changeset
   117
        selectorCache := (nameAndTypeCache name , nameAndTypeCache descriptor) asSymbol
0d275432230d - JavaRef2
vranyj1
parents: 1655
diff changeset
   118
    ].
0d275432230d - JavaRef2
vranyj1
parents: 1655
diff changeset
   119
    numArgSlotsCache := JavaMethod numArgsFromSignature: nameAndTypeCache descriptor.
0d275432230d - JavaRef2
vranyj1
parents: 1655
diff changeset
   120
    returnTypeChar := nameAndTypeCache descriptor last.
0d275432230d - JavaRef2
vranyj1
parents: 1655
diff changeset
   121
    returnTypeChar == $V ifTrue:[
0d275432230d - JavaRef2
vranyj1
parents: 1655
diff changeset
   122
        returnTypeCache := JavaMethod r_void.    
0d275432230d - JavaRef2
vranyj1
parents: 1655
diff changeset
   123
    ] ifFalse:[
1743
738b4557eab7 Bug fix for retval type (long is J, not L)
vranyj1
parents: 1728
diff changeset
   124
        returnTypeChar == $J ifTrue:[
1728
0d275432230d - JavaRef2
vranyj1
parents: 1655
diff changeset
   125
            returnTypeCache := JavaMethod r_long.
0d275432230d - JavaRef2
vranyj1
parents: 1655
diff changeset
   126
        ] ifFalse:[
0d275432230d - JavaRef2
vranyj1
parents: 1655
diff changeset
   127
            returnTypeChar == $D ifTrue:[
0d275432230d - JavaRef2
vranyj1
parents: 1655
diff changeset
   128
                returnTypeCache := JavaMethod r_double.
0d275432230d - JavaRef2
vranyj1
parents: 1655
diff changeset
   129
            ] ifFalse:[
0d275432230d - JavaRef2
vranyj1
parents: 1655
diff changeset
   130
                returnTypeCache := 0.
0d275432230d - JavaRef2
vranyj1
parents: 1655
diff changeset
   131
            ]
0d275432230d - JavaRef2
vranyj1
parents: 1655
diff changeset
   132
        ]
0d275432230d - JavaRef2
vranyj1
parents: 1655
diff changeset
   133
    ]
0d275432230d - JavaRef2
vranyj1
parents: 1655
diff changeset
   134
0d275432230d - JavaRef2
vranyj1
parents: 1655
diff changeset
   135
    "Created: / 15-10-2012 / 23:13:45 / Jan Vrany <jan.vrany@fit.cvut.cz>"
0d275432230d - JavaRef2
vranyj1
parents: 1655
diff changeset
   136
! !
0d275432230d - JavaRef2
vranyj1
parents: 1655
diff changeset
   137
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   138
!JavaMethodRef2 class methodsFor:'documentation'!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   139
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   140
version_SVN
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   141
    ^ '$Id$'
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   142
! !