JavaClassReader.st
author Jan Vrany <jan.vrany@fit.cvut.cz>
Thu, 27 Sep 2018 23:09:30 +0100
changeset 3854 193b04caef42
parent 3661 babc6ab26e36
permissions -rw-r--r--
Specifiy both source ant target Java versions ...when compiling Java code. Since `stx:libjava` only supports Java 7, make sure all code is compiled targeting Java 7.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
454
38f590639d65 *** empty log message ***
cg
parents: 443
diff changeset
     1
"
3324
a58245c0e83a Updated copyright notices.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3294
diff changeset
     2
 COPYRIGHT (c) 1996-2015 by Claus Gittinger
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
     3
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
     4
 New code and modifications done at SWING Research Group [1]:
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
     5
3324
a58245c0e83a Updated copyright notices.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3294
diff changeset
     6
 COPYRIGHT (c) 2010-2015 by Jan Vrany, Jan Kurs and Marcel Hlopko
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
     7
                            SWING Research Group, Czech Technical University in Prague
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
     8
454
38f590639d65 *** empty log message ***
cg
parents: 443
diff changeset
     9
 This software is furnished under a license and may be used
38f590639d65 *** empty log message ***
cg
parents: 443
diff changeset
    10
 only in accordance with the terms of that license and with the
38f590639d65 *** empty log message ***
cg
parents: 443
diff changeset
    11
 inclusion of the above copyright notice.   This software may not
38f590639d65 *** empty log message ***
cg
parents: 443
diff changeset
    12
 be provided or otherwise made available to, or used by, any
38f590639d65 *** empty log message ***
cg
parents: 443
diff changeset
    13
 other person.  No title to or ownership of the software is
38f590639d65 *** empty log message ***
cg
parents: 443
diff changeset
    14
 hereby transferred.
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
    15
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
    16
 [1] Code written at SWING Research Group contains a signature
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
    17
     of one of the above copright owners. For exact set of such code,
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
    18
     see the differences between this version and version stx:libjava
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
    19
     as of 1.9.2010
454
38f590639d65 *** empty log message ***
cg
parents: 443
diff changeset
    20
"
695
fd5acdd14995 utf8 string decoding
cg
parents: 667
diff changeset
    21
"{ Package: 'stx:libjava' }"
fd5acdd14995 utf8 string decoding
cg
parents: 667
diff changeset
    22
3384
98eb8443f4f4 Use new Logger API (use Logger severityXXX instead of symbols)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3324
diff changeset
    23
"{ NameSpace: Smalltalk }"
98eb8443f4f4 Use new Logger API (use Logger severityXXX instead of symbols)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3324
diff changeset
    24
1
083530508d9c intitial checkin
cg
parents:
diff changeset
    25
Object subclass:#JavaClassReader
91
9b325648aa77 resolve rewritten; interpreter fixes
cg
parents: 86
diff changeset
    26
	instanceVariableNames:'inStream msb constants majorVsn minorVsn constNeeds2Slots
3003
c9f0019485ff get rid of old mh breakpoint
Marcel Hlopko <marcel.hlopko@gmail.com>
parents: 2966
diff changeset
    27
		constSlot classBeingLoaded classLoader attributes'
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
    28
	classVariableNames:'Verbose AnnotationsVerbose Silent AbsolutelySilent
3003
c9f0019485ff get rid of old mh breakpoint
Marcel Hlopko <marcel.hlopko@gmail.com>
parents: 2966
diff changeset
    29
		LazyClassLoading InvalidClassFormatSignal ClassLoaderQuerySignal
c9f0019485ff get rid of old mh breakpoint
Marcel Hlopko <marcel.hlopko@gmail.com>
parents: 2966
diff changeset
    30
		JavaArchiveCache JavaArchiveCacheLock LastJavaArchive
3275
881799d310e3 Intern all constant pool strings.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3198
diff changeset
    31
		LastJavaArchiveLock MaxContextSize MaxContextSizeLimit
881799d310e3 Intern all constant pool strings.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3198
diff changeset
    32
		InternedStrings'
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
    33
	poolDictionaries:'JavaConstants'
2108
ca8c4e7db2e8 category change
Claus Gittinger <cg@exept.de>
parents: 2089
diff changeset
    34
	category:'Languages-Java-Support'
1
083530508d9c intitial checkin
cg
parents:
diff changeset
    35
!
083530508d9c intitial checkin
cg
parents:
diff changeset
    36
454
38f590639d65 *** empty log message ***
cg
parents: 443
diff changeset
    37
!JavaClassReader class methodsFor:'documentation'!
38f590639d65 *** empty log message ***
cg
parents: 443
diff changeset
    38
38f590639d65 *** empty log message ***
cg
parents: 443
diff changeset
    39
copyright
38f590639d65 *** empty log message ***
cg
parents: 443
diff changeset
    40
"
3324
a58245c0e83a Updated copyright notices.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3294
diff changeset
    41
 COPYRIGHT (c) 1996-2015 by Claus Gittinger
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
    42
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
    43
 New code and modifications done at SWING Research Group [1]:
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
    44
3324
a58245c0e83a Updated copyright notices.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3294
diff changeset
    45
 COPYRIGHT (c) 2010-2015 by Jan Vrany, Jan Kurs and Marcel Hlopko
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
    46
                            SWING Research Group, Czech Technical University in Prague
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
    47
454
38f590639d65 *** empty log message ***
cg
parents: 443
diff changeset
    48
 This software is furnished under a license and may be used
38f590639d65 *** empty log message ***
cg
parents: 443
diff changeset
    49
 only in accordance with the terms of that license and with the
38f590639d65 *** empty log message ***
cg
parents: 443
diff changeset
    50
 inclusion of the above copyright notice.   This software may not
38f590639d65 *** empty log message ***
cg
parents: 443
diff changeset
    51
 be provided or otherwise made available to, or used by, any
38f590639d65 *** empty log message ***
cg
parents: 443
diff changeset
    52
 other person.  No title to or ownership of the software is
38f590639d65 *** empty log message ***
cg
parents: 443
diff changeset
    53
 hereby transferred.
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
    54
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
    55
 [1] Code written at SWING Research Group contains a signature
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
    56
     of one of the above copright owners. For exact set of such code,
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
    57
     see the differences between this version and version stx:libjava
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
    58
     as of 1.9.2010
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
    59
454
38f590639d65 *** empty log message ***
cg
parents: 443
diff changeset
    60
"
38f590639d65 *** empty log message ***
cg
parents: 443
diff changeset
    61
! !
1
083530508d9c intitial checkin
cg
parents:
diff changeset
    62
135
098936234135 *** empty log message ***
cg
parents: 128
diff changeset
    63
!JavaClassReader class methodsFor:'initialization'!
1
083530508d9c intitial checkin
cg
parents:
diff changeset
    64
3275
881799d310e3 Intern all constant pool strings.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3198
diff changeset
    65
flushInternedStrings
881799d310e3 Intern all constant pool strings.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3198
diff changeset
    66
    self initializeInternedStrings
881799d310e3 Intern all constant pool strings.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3198
diff changeset
    67
881799d310e3 Intern all constant pool strings.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3198
diff changeset
    68
    "Created: / 13-11-2014 / 12:13:30 / Jan Vrany <jan.vrany@fit.cvut.cz>"
881799d310e3 Intern all constant pool strings.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3198
diff changeset
    69
!
881799d310e3 Intern all constant pool strings.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3198
diff changeset
    70
1
083530508d9c intitial checkin
cg
parents:
diff changeset
    71
initialize
3275
881799d310e3 Intern all constant pool strings.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3198
diff changeset
    72
    InvalidClassFormatSignal := Signal new mayProceed:true.
881799d310e3 Intern all constant pool strings.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3198
diff changeset
    73
    InvalidClassFormatSignal notifierString:'class load failure'.
881799d310e3 Intern all constant pool strings.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3198
diff changeset
    74
    InvalidClassFormatSignal nameClass:self message:#invalidClassFormatSignal.
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
    75
    Verbose := false.
91
9b325648aa77 resolve rewritten; interpreter fixes
cg
parents: 86
diff changeset
    76
    Silent := true.
9b325648aa77 resolve rewritten; interpreter fixes
cg
parents: 86
diff changeset
    77
    AbsolutelySilent := false.
3290
76d4443744ed JavaClass memory optimization (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3289
diff changeset
    78
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
    79
    "/LazyClassLoading := false.
3290
76d4443744ed JavaClass memory optimization (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3289
diff changeset
    80
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
    81
    LazyClassLoading := true.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
    82
    ClassLoaderQuerySignal := QuerySignal new.
3275
881799d310e3 Intern all constant pool strings.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3198
diff changeset
    83
    ClassLoaderQuerySignal defaultAnswer:[ JavaVM systemClassLoader ].
881799d310e3 Intern all constant pool strings.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3198
diff changeset
    84
    self initializeArchiveCache.
881799d310e3 Intern all constant pool strings.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3198
diff changeset
    85
    JavaArchiveCacheLock := RecursionLock new.
881799d310e3 Intern all constant pool strings.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3198
diff changeset
    86
    LastJavaArchiveLock := RecursionLock new.
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
    87
    AnnotationsVerbose := false.
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
    88
    MaxContextSize := 0.
3275
881799d310e3 Intern all constant pool strings.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3198
diff changeset
    89
     "Maximum stack depth supported by the VM.
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
    90
     if you change it, make sure it is equal (or lower)
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
    91
     to CONSIZE in jinterpret.c (line 111 or so)
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
    92
     Otherwise, VM may crash!!!!!!"
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
    93
    MaxContextSizeLimit := 100.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
    94
3275
881799d310e3 Intern all constant pool strings.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3198
diff changeset
    95
    self initializeInternedStrings.
29
eb3367f8fb9b checkin from browser
cg
parents: 27
diff changeset
    96
eb3367f8fb9b checkin from browser
cg
parents: 27
diff changeset
    97
    "
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
    98
     JavaClassReader initialize"
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
    99
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   100
    "Modified: / 27-01-1998 / 17:54:23 / cg"
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   101
    "Modified: / 17-12-2010 / 17:37:45 / Marcel Hlopko <hlopik@gmail.com>"
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   102
    "Modified: / 10-05-2011 / 23:59:53 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   103
    "Modified: / 14-08-2012 / 02:01:37 / jv"
3275
881799d310e3 Intern all constant pool strings.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3198
diff changeset
   104
    "Modified (comment): / 13-11-2014 / 12:12:11 / Jan Vrany <jan.vrany@fit.cvut.cz>"
881799d310e3 Intern all constant pool strings.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3198
diff changeset
   105
!
881799d310e3 Intern all constant pool strings.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3198
diff changeset
   106
881799d310e3 Intern all constant pool strings.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3198
diff changeset
   107
initializeArchiveCache
881799d310e3 Intern all constant pool strings.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3198
diff changeset
   108
    OperatingSystem isMSWINDOWSlike ifFalse:[
881799d310e3 Intern all constant pool strings.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3198
diff changeset
   109
        JavaArchiveCache := CacheDictionary new:32.
881799d310e3 Intern all constant pool strings.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3198
diff changeset
   110
    ] ifTrue:[
881799d310e3 Intern all constant pool strings.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3198
diff changeset
   111
        JavaArchiveCache := CacheDictionary new:8.
881799d310e3 Intern all constant pool strings.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3198
diff changeset
   112
    ]
881799d310e3 Intern all constant pool strings.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3198
diff changeset
   113
!
881799d310e3 Intern all constant pool strings.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3198
diff changeset
   114
881799d310e3 Intern all constant pool strings.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3198
diff changeset
   115
initializeInternedStrings
881799d310e3 Intern all constant pool strings.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3198
diff changeset
   116
     "Constant pool strings are interned to save memory
3290
76d4443744ed JavaClass memory optimization (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3289
diff changeset
   117
     and kept in InternedStrings variable"
3275
881799d310e3 Intern all constant pool strings.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3198
diff changeset
   118
    InternedStrings := Set new
881799d310e3 Intern all constant pool strings.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3198
diff changeset
   119
881799d310e3 Intern all constant pool strings.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3198
diff changeset
   120
    "Modified (comment): / 13-11-2014 / 12:12:31 / Jan Vrany <jan.vrany@fit.cvut.cz>"
198
5543d1079a4a *** empty log message ***
cg
parents: 193
diff changeset
   121
! !
5543d1079a4a *** empty log message ***
cg
parents: 193
diff changeset
   122
5543d1079a4a *** empty log message ***
cg
parents: 193
diff changeset
   123
!JavaClassReader class methodsFor:'Signal constants'!
5543d1079a4a *** empty log message ***
cg
parents: 193
diff changeset
   124
223
4dd38bd4f6b2 allow trampoulining back into java for sub-loads
cg
parents: 219
diff changeset
   125
classLoaderQuerySignal
4dd38bd4f6b2 allow trampoulining back into java for sub-loads
cg
parents: 219
diff changeset
   126
    ^ ClassLoaderQuerySignal
4dd38bd4f6b2 allow trampoulining back into java for sub-loads
cg
parents: 219
diff changeset
   127
4dd38bd4f6b2 allow trampoulining back into java for sub-loads
cg
parents: 219
diff changeset
   128
    "Created: 14.8.1997 / 19:56:03 / cg"
4dd38bd4f6b2 allow trampoulining back into java for sub-loads
cg
parents: 219
diff changeset
   129
!
4dd38bd4f6b2 allow trampoulining back into java for sub-loads
cg
parents: 219
diff changeset
   130
198
5543d1079a4a *** empty log message ***
cg
parents: 193
diff changeset
   131
invalidClassFormatSignal
5543d1079a4a *** empty log message ***
cg
parents: 193
diff changeset
   132
    ^ InvalidClassFormatSignal
5543d1079a4a *** empty log message ***
cg
parents: 193
diff changeset
   133
5543d1079a4a *** empty log message ***
cg
parents: 193
diff changeset
   134
    "Created: 3.8.1997 / 18:17:21 / cg"
1
083530508d9c intitial checkin
cg
parents:
diff changeset
   135
! !
083530508d9c intitial checkin
cg
parents:
diff changeset
   136
344
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
   137
!JavaClassReader class methodsFor:'constants'!
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
   138
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   139
fileMajorVersions
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   140
    ^#(
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   141
        45  "Java 1.0.2"
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   142
        46  "Java 1.2"
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   143
        47  "???"
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   144
        48  "???"
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   145
        49  "Java 5"
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   146
        50  "Java 6"
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   147
      ).
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   148
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   149
    "
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   150
     JSR 202:
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   151
     The Java virtual machine implementation of Sun's JDK release 1.0.2 supports
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   152
     class file format versions 45.0 through 45.3 inclusive. Sun's JDK releases
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   153
     1.1.X can support class file formats of versions in the range 45.0 through
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   154
     45.65535 inclusive. For k > 1 implementations of version 1.k of the Java 2
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   155
     platform can support class file formats of versions in the range 45.0 through
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   156
     44+k.0 inclusive.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   157
"
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   158
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   159
    "Created: / 19-10-2010 / 21:40:36 / Jan Vrany <jan.vrany@fit.cvut.cz>"
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   160
    "Modified: / 02-06-2011 / 22:50:17 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   161
    "Modified: / 18-08-2011 / 19:32:37 / jv"
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   162
    "Modified (comment): / 16-08-2012 / 15:34:37 / Jan Vrany <jan.vrany@fit.cvut.cz>"
344
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
   163
!
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
   164
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   165
fileMinorVersions
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   166
    ^ #(
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   167
        3 "Java 1.0.2 , Java 1.2"
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   168
        0 "Java 6"
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   169
    )
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   170
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   171
    "Created: / 19-10-2010 / 21:41:04 / Jan Vrany <jan.vrany@fit.cvut.cz>"
344
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
   172
!
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
   173
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
   174
magic_LSB
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
   175
    ^ 16rBEBAFECA
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
   176
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
   177
    "Modified: / 7.5.1998 / 13:14:27 / cg"
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
   178
    "Created: / 7.5.1998 / 13:15:05 / cg"
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
   179
!
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
   180
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
   181
magic_MSB
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
   182
    ^ 16rCAFEBABE
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
   183
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
   184
    "Modified: / 7.5.1998 / 13:14:27 / cg"
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
   185
! !
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
   186
135
098936234135 *** empty log message ***
cg
parents: 128
diff changeset
   187
!JavaClassReader class methodsFor:'debugging'!
1
083530508d9c intitial checkin
cg
parents:
diff changeset
   188
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   189
annotationsVerbose:aBoolean
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   190
    AnnotationsVerbose := aBoolean
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   191
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   192
    "
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   193
     Java flushClasses.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   194
     JavaClassReader verbose:true
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   195
     JavaClassReader verbose:false"
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   196
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   197
    "Created: / 25-02-2011 / 12:25:23 / Marcel Hlopko <hlopik@gmail.com>"
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   198
!
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   199
1
083530508d9c intitial checkin
cg
parents:
diff changeset
   200
verbose:aBoolean
083530508d9c intitial checkin
cg
parents:
diff changeset
   201
    Verbose := aBoolean
083530508d9c intitial checkin
cg
parents:
diff changeset
   202
083530508d9c intitial checkin
cg
parents:
diff changeset
   203
    "
67
a72c949d86dd *** empty log message ***
cg
parents: 62
diff changeset
   204
     Java flushClasses.
1
083530508d9c intitial checkin
cg
parents:
diff changeset
   205
     JavaClassReader verbose:true
083530508d9c intitial checkin
cg
parents:
diff changeset
   206
     JavaClassReader verbose:false
083530508d9c intitial checkin
cg
parents:
diff changeset
   207
    "
083530508d9c intitial checkin
cg
parents:
diff changeset
   208
! !
083530508d9c intitial checkin
cg
parents:
diff changeset
   209
135
098936234135 *** empty log message ***
cg
parents: 128
diff changeset
   210
!JavaClassReader class methodsFor:'file reading'!
1
083530508d9c intitial checkin
cg
parents:
diff changeset
   211
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   212
readClass: aClassName
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   213
    "reads a class, and returns it.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   214
     <clinit> is NOT called, class is NOT installed"
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   215
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   216
    ^ self readClass: aClassName ignoring: Set new.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   217
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   218
    "Created: / 15-04-1996 / 14:58:53 / cg"
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   219
    "Modified: / 20-10-1998 / 17:24:54 / cg"
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   220
    "Modified: / 08-09-2011 / 08:10:58 / Jan Vrany <jan.vrany@fit.cvut.cz>"
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   221
    "Modified (comment): / 07-02-2013 / 14:21:30 / Jan Vrany <jan.vrany@fit.cvut.cz>"
21
b9dd73f299dd checkin from browser
cg
parents: 14
diff changeset
   222
!
b9dd73f299dd checkin from browser
cg
parents: 14
diff changeset
   223
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   224
readClass: aClassName classPath: classPath
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   225
    "reads a class, and returns it.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   226
     <clinit> is NOT called, class is NOT installed"
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   227
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   228
    ^ self readClass: aClassName ignoring: Set new classPath: classPath
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   229
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   230
    "Created: / 15-04-1996 / 14:58:53 / cg"
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   231
    "Modified: / 20-10-1998 / 17:24:54 / cg"
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   232
    "Modified: / 08-09-2011 / 08:10:58 / Jan Vrany <jan.vrany@fit.cvut.cz>"
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   233
    "Created: / 30-10-2011 / 12:27:59 / Jan Vrany <jan.vrany@fit.cvut.cz>"
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   234
    "Modified (comment): / 07-02-2013 / 14:21:12 / Jan Vrany <jan.vrany@fit.cvut.cz>"
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   235
!
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   236
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   237
readClass: className ignoring: classesBeingLoadedOrNil
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   238
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   239
    "This method is bit hacky, as it tries to supply 'correct'
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   240
     classloader.
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   241
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   242
    If the class is loaded from Java release classPath (containing
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   243
    base java classes shipped with JDK/JRE), then set the classloader
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   244
    to null. Otherwise set class's loader to system class loader
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   245
    (as returned by ClassLoader#getSystemClassLoader())
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   246
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   247
    This is required to run groovy and other SW that uses resources
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   248
    or other classloader dependent stuff. When changing, make sure
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   249
    Groovy is running afterwards!!!!!!
7
de8ce26e1f2c checkin from browser
cg
parents: 5
diff changeset
   250
    "
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   251
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   252
    | class |
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   253
    class := self
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   254
                readClass: className ignoring: classesBeingLoadedOrNil
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   255
                classPath: Java release classPath.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   256
    class notNil ifTrue:[ ^ class ].
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   257
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   258
    class isNil ifTrue:[
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   259
        JavaVM booted ifFalse:[
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   260
            ^nil
350
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
   261
        ].
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   262
        JavaClassReader classLoaderQuerySignal answer: JavaVM systemClassLoader do:[
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   263
            class := self
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   264
                readClass: className ignoring: classesBeingLoadedOrNil
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   265
                classPath: Java classPath.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   266
        ].
327
990c71581df3 support reading from zip-archives
cg
parents: 318
diff changeset
   267
    ].
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   268
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   269
    ^class
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   270
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   271
    "Created: / 15-04-1996 / 14:58:53 / cg"
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   272
    "Modified: / 20-10-1998 / 17:24:54 / cg"
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   273
    "Modified: / 21-10-2011 / 13:39:14 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   274
    "Modified: / 30-10-2011 / 16:50:05 / Jan Vrany <jan.vrany@fit.cvut.cz>"
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   275
!
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   276
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   277
readClass: className ignoring: ignoring classPath: classPath
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   278
    | cls |
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   279
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   280
    cls := self new readClass: className ignoring: ignoring classPath: classPath.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   281
    cls notNil ifTrue:[
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   282
        Logger
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   283
            log: 'loaded class ' , cls displayString
3384
98eb8443f4f4 Use new Logger API (use Logger severityXXX instead of symbols)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3324
diff changeset
   284
            severity: Logger severityTRACE
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   285
            facility: 'JVM'.
54
f37bcefb7091 avoid loading classes twice
cg
parents: 52
diff changeset
   286
    ].
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   287
    ^cls.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   288
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   289
    "Created: / 07-02-2013 / 14:34:44 / Jan Vrany <jan.vrany@fit.cvut.cz>"
3384
98eb8443f4f4 Use new Logger API (use Logger severityXXX instead of symbols)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3324
diff changeset
   290
    "Modified: / 02-03-2015 / 14:08:26 / Jan Vrany <jan.vrany@fit.cvut.cz>"
43
2c4ca2eb8d07 checkin from browser
cg
parents: 40
diff changeset
   291
!
2c4ca2eb8d07 checkin from browser
cg
parents: 40
diff changeset
   292
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   293
readFile:aFilename ignoring:classesBeingLoaded
7
de8ce26e1f2c checkin from browser
cg
parents: 5
diff changeset
   294
    "reads a class from aFilename and returns it.
91
9b325648aa77 resolve rewritten; interpreter fixes
cg
parents: 86
diff changeset
   295
     The JavaClass is NOT installed as global and unresolved
9b325648aa77 resolve rewritten; interpreter fixes
cg
parents: 86
diff changeset
   296
     refs are NOT patched."
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   297
2476
d24ce8174195 JavaClass can now keep it's classfile bytes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2431
diff changeset
   298
    | inStream |
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   299
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   300
    [
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   301
        JavaVM commonOpenStreamUsing:[ inStream := aFilename asFilename readStream ]
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   302
    ] on:StreamError do:[:ex |
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   303
        Logger
3384
98eb8443f4f4 Use new Logger API (use Logger severityXXX instead of symbols)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3324
diff changeset
   304
            log:('cannot read .class file: ' , ex description) severity:Logger severityERROR facility:'JVM'.
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   305
        self breakPoint: #jv.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   306
        ^ nil
43
2c4ca2eb8d07 checkin from browser
cg
parents: 40
diff changeset
   307
    ].
21
b9dd73f299dd checkin from browser
cg
parents: 14
diff changeset
   308
2476
d24ce8174195 JavaClass can now keep it's classfile bytes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2431
diff changeset
   309
    ^[
d24ce8174195 JavaClass can now keep it's classfile bytes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2431
diff changeset
   310
        self readStream:inStream ignoring:classesBeingLoaded.
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   311
    ] ensure:[
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   312
        inStream close.
91
9b325648aa77 resolve rewritten; interpreter fixes
cg
parents: 86
diff changeset
   313
    ].
1
083530508d9c intitial checkin
cg
parents:
diff changeset
   314
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   315
    "Created: / 15-04-1996 / 14:58:53 / cg"
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   316
    "Modified: / 09-05-1998 / 01:44:24 / cg"
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   317
    "Modified: / 14-08-2012 / 02:17:26 / jv"
3384
98eb8443f4f4 Use new Logger API (use Logger severityXXX instead of symbols)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3324
diff changeset
   318
    "Modified: / 02-03-2015 / 14:08:14 / Jan Vrany <jan.vrany@fit.cvut.cz>"
1
083530508d9c intitial checkin
cg
parents:
diff changeset
   319
!
083530508d9c intitial checkin
cg
parents:
diff changeset
   320
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   321
readStream: aStream
198
5543d1079a4a *** empty log message ***
cg
parents: 193
diff changeset
   322
    "reads a class from aStream and returns it.
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   323
     The JavaClass is not installed as global"
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   324
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   325
    ^self readStream: aStream ignoring: Set new.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   326
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   327
    "Created: / 24-10-2011 / 00:12:09 / Jan Vrany <jan.vrany@fit.cvut.cz>"
198
5543d1079a4a *** empty log message ***
cg
parents: 193
diff changeset
   328
!
5543d1079a4a *** empty log message ***
cg
parents: 193
diff changeset
   329
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   330
readStream: stream ignoring: classesBeingLoaded
2578
fc6186a4961f Performance optimization: rewrote 'JavaVM classNamed:' to 'JavaVM classNamed:...definedBy:...'.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2566
diff changeset
   331
    "reads a class from aStream and returns it.
fc6186a4961f Performance optimization: rewrote 'JavaVM classNamed:' to 'JavaVM classNamed:...definedBy:...'.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2566
diff changeset
   332
     The JavaClass is not installed as global"
fc6186a4961f Performance optimization: rewrote 'JavaVM classNamed:' to 'JavaVM classNamed:...definedBy:...'.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2566
diff changeset
   333
fc6186a4961f Performance optimization: rewrote 'JavaVM classNamed:' to 'JavaVM classNamed:...definedBy:...'.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2566
diff changeset
   334
    ^self readStream: stream loader: self classLoaderQuerySignal query ignoring: classesBeingLoaded
fc6186a4961f Performance optimization: rewrote 'JavaVM classNamed:' to 'JavaVM classNamed:...definedBy:...'.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2566
diff changeset
   335
fc6186a4961f Performance optimization: rewrote 'JavaVM classNamed:' to 'JavaVM classNamed:...definedBy:...'.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2566
diff changeset
   336
    "Modified: / 30-03-1998 / 18:14:40 / cg"
fc6186a4961f Performance optimization: rewrote 'JavaVM classNamed:' to 'JavaVM classNamed:...definedBy:...'.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2566
diff changeset
   337
    "Modified: / 09-05-2011 / 23:15:30 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
fc6186a4961f Performance optimization: rewrote 'JavaVM classNamed:' to 'JavaVM classNamed:...definedBy:...'.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2566
diff changeset
   338
    "Modified: / 02-05-2013 / 09:51:16 / Jan Vrany <jan.vrany@fit.cvut.cz>"
fc6186a4961f Performance optimization: rewrote 'JavaVM classNamed:' to 'JavaVM classNamed:...definedBy:...'.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2566
diff changeset
   339
!
fc6186a4961f Performance optimization: rewrote 'JavaVM classNamed:' to 'JavaVM classNamed:...definedBy:...'.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2566
diff changeset
   340
fc6186a4961f Performance optimization: rewrote 'JavaVM classNamed:' to 'JavaVM classNamed:...definedBy:...'.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2566
diff changeset
   341
readStream: stream loader: classloader
fc6186a4961f Performance optimization: rewrote 'JavaVM classNamed:' to 'JavaVM classNamed:...definedBy:...'.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2566
diff changeset
   342
    "reads a class from aStream and returns it.
fc6186a4961f Performance optimization: rewrote 'JavaVM classNamed:' to 'JavaVM classNamed:...definedBy:...'.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2566
diff changeset
   343
     The JavaClass is not installed as global"
fc6186a4961f Performance optimization: rewrote 'JavaVM classNamed:' to 'JavaVM classNamed:...definedBy:...'.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2566
diff changeset
   344
fc6186a4961f Performance optimization: rewrote 'JavaVM classNamed:' to 'JavaVM classNamed:...definedBy:...'.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2566
diff changeset
   345
    ^self readStream: stream loader: classloader ignoring: Set new.
fc6186a4961f Performance optimization: rewrote 'JavaVM classNamed:' to 'JavaVM classNamed:...definedBy:...'.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2566
diff changeset
   346
fc6186a4961f Performance optimization: rewrote 'JavaVM classNamed:' to 'JavaVM classNamed:...definedBy:...'.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2566
diff changeset
   347
    "Created: / 02-05-2013 / 09:51:36 / Jan Vrany <jan.vrany@fit.cvut.cz>"
fc6186a4961f Performance optimization: rewrote 'JavaVM classNamed:' to 'JavaVM classNamed:...definedBy:...'.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2566
diff changeset
   348
!
fc6186a4961f Performance optimization: rewrote 'JavaVM classNamed:' to 'JavaVM classNamed:...definedBy:...'.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2566
diff changeset
   349
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   350
readStream: stream loader: classloader ignoring: classesBeingLoaded
7
de8ce26e1f2c checkin from browser
cg
parents: 5
diff changeset
   351
    "reads a class from aStream and returns it.
de8ce26e1f2c checkin from browser
cg
parents: 5
diff changeset
   352
     The JavaClass is not installed as global"
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   353
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   354
    | javaClass |
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   355
2578
fc6186a4961f Performance optimization: rewrote 'JavaVM classNamed:' to 'JavaVM classNamed:...definedBy:...'.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2566
diff changeset
   356
    javaClass := JavaClassReader new readStream: stream loader: classloader ignoring: classesBeingLoaded.
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   357
    Logger
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   358
        log: 'loaded class ' , javaClass displayString
3384
98eb8443f4f4 Use new Logger API (use Logger severityXXX instead of symbols)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3324
diff changeset
   359
        severity: Logger severityTRACE
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   360
        facility: 'JVM'.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   361
    ^ javaClass.
327
990c71581df3 support reading from zip-archives
cg
parents: 318
diff changeset
   362
2578
fc6186a4961f Performance optimization: rewrote 'JavaVM classNamed:' to 'JavaVM classNamed:...definedBy:...'.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2566
diff changeset
   363
    "Created: / 02-05-2013 / 09:50:41 / Jan Vrany <jan.vrany@fit.cvut.cz>"
3384
98eb8443f4f4 Use new Logger API (use Logger severityXXX instead of symbols)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3324
diff changeset
   364
    "Modified: / 02-03-2015 / 14:08:32 / Jan Vrany <jan.vrany@fit.cvut.cz>"
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   365
! !
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   366
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   367
!JavaClassReader class methodsFor:'obsolete'!
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   368
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   369
resolveClass: aJavaClass
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   370
    "Resolve a particular classes' constants.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   371
     Perform all class initialization functions
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   372
     (of those which are not yet initialized)."
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   373
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   374
    | loader  classToLoad |
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   375
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   376
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   377
     "new resolving does not need this - shouldn't be called at all"
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   378
    LazyClassLoading ifFalse: [
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   379
        loader := (aJavaClass classLoader).
399
94d37f2032a1 classloader fixes.
cg
parents: 386
diff changeset
   380
        [
94d37f2032a1 classloader fixes.
cg
parents: 386
diff changeset
   381
            classToLoad := nil.
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   382
            aJavaClass constantPool do: [
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   383
                :item |
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   384
                | itemClass |
399
94d37f2032a1 classloader fixes.
cg
parents: 386
diff changeset
   385
94d37f2032a1 classloader fixes.
cg
parents: 386
diff changeset
   386
                itemClass := item class.
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   387
                itemClass == JavaUnresolvedClassConstant ifTrue: [
399
94d37f2032a1 classloader fixes.
cg
parents: 386
diff changeset
   388
                    classToLoad := item className.
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   389
399
94d37f2032a1 classloader fixes.
cg
parents: 386
diff changeset
   390
"/                ] ifFalse:[
94d37f2032a1 classloader fixes.
cg
parents: 386
diff changeset
   391
"/                    itemClass == JavaUnresolvedMethodrefConstant ifTrue:[
94d37f2032a1 classloader fixes.
cg
parents: 386
diff changeset
   392
"/self halt.
94d37f2032a1 classloader fixes.
cg
parents: 386
diff changeset
   393
"/                    ] ifFalse:[
94d37f2032a1 classloader fixes.
cg
parents: 386
diff changeset
   394
"/                        itemClass == JavaUnresolvedInterfaceMethodrefConstant ifTrue:[
94d37f2032a1 classloader fixes.
cg
parents: 386
diff changeset
   395
"/self halt.
94d37f2032a1 classloader fixes.
cg
parents: 386
diff changeset
   396
"/                        ]
94d37f2032a1 classloader fixes.
cg
parents: 386
diff changeset
   397
"/                    ]
94d37f2032a1 classloader fixes.
cg
parents: 386
diff changeset
   398
                ].
94d37f2032a1 classloader fixes.
cg
parents: 386
diff changeset
   399
            ].
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   400
            classToLoad notNil ifTrue: [
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   401
                loader isNil ifTrue: [ JavaVM classForName: classToLoad. ] ifFalse: [
399
94d37f2032a1 classloader fixes.
cg
parents: 386
diff changeset
   402
                    "/
94d37f2032a1 classloader fixes.
cg
parents: 386
diff changeset
   403
                    "/ the aquired loader is a javaClassLoader
94d37f2032a1 classloader fixes.
cg
parents: 386
diff changeset
   404
                    "/ which expects an URL as arg.
94d37f2032a1 classloader fixes.
cg
parents: 386
diff changeset
   405
                    "/
94d37f2032a1 classloader fixes.
cg
parents: 386
diff changeset
   406
                    "/ classURL := Java as_URL:('file:' , nextUnresolved asString , '.class').
94d37f2032a1 classloader fixes.
cg
parents: 386
diff changeset
   407
                    "/ loader loadClass:classURL
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   408
                    loader perform: #'loadClass(Ljava/lang/String;)Ljava/lang/Class;'
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   409
                        with: (Java as_String: (classToLoad asString)).
399
94d37f2032a1 classloader fixes.
cg
parents: 386
diff changeset
   410
                ]
94d37f2032a1 classloader fixes.
cg
parents: 386
diff changeset
   411
            ].
94d37f2032a1 classloader fixes.
cg
parents: 386
diff changeset
   412
            classToLoad notNil.
94d37f2032a1 classloader fixes.
cg
parents: 386
diff changeset
   413
        ] whileTrue.
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   414
        aJavaClass isInitialized ifFalse: [
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   415
            Silent ifFalse: [
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   416
                'performing class initialization of ' print.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   417
                aJavaClass fullName printCR.
399
94d37f2032a1 classloader fixes.
cg
parents: 386
diff changeset
   418
            ].
94d37f2032a1 classloader fixes.
cg
parents: 386
diff changeset
   419
            aJavaClass classInit
94d37f2032a1 classloader fixes.
cg
parents: 386
diff changeset
   420
        ].
94d37f2032a1 classloader fixes.
cg
parents: 386
diff changeset
   421
    ]
94d37f2032a1 classloader fixes.
cg
parents: 386
diff changeset
   422
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   423
    "Created: / 20-10-1998 / 17:53:22 / cg"
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   424
    "Modified: / 16-11-2011 / 14:39:32 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   425
! !
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   426
2578
fc6186a4961f Performance optimization: rewrote 'JavaVM classNamed:' to 'JavaVM classNamed:...definedBy:...'.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2566
diff changeset
   427
!JavaClassReader class methodsFor:'others'!
fc6186a4961f Performance optimization: rewrote 'JavaVM classNamed:' to 'JavaVM classNamed:...definedBy:...'.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2566
diff changeset
   428
fc6186a4961f Performance optimization: rewrote 'JavaVM classNamed:' to 'JavaVM classNamed:...definedBy:...'.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2566
diff changeset
   429
version_HG
fc6186a4961f Performance optimization: rewrote 'JavaVM classNamed:' to 'JavaVM classNamed:...definedBy:...'.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2566
diff changeset
   430
fc6186a4961f Performance optimization: rewrote 'JavaVM classNamed:' to 'JavaVM classNamed:...definedBy:...'.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2566
diff changeset
   431
    ^ '$Changeset: <not expanded> $'
fc6186a4961f Performance optimization: rewrote 'JavaVM classNamed:' to 'JavaVM classNamed:...definedBy:...'.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2566
diff changeset
   432
! !
fc6186a4961f Performance optimization: rewrote 'JavaVM classNamed:' to 'JavaVM classNamed:...definedBy:...'.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2566
diff changeset
   433
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   434
!JavaClassReader methodsFor:'accessing'!
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   435
3291
2cf782f380f2 JavaClass memory optimization (part 2)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3290
diff changeset
   436
constantPoolAt: index
2cf782f380f2 JavaClass memory optimization (part 2)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3290
diff changeset
   437
    ^ constants at: index
2cf782f380f2 JavaClass memory optimization (part 2)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3290
diff changeset
   438
2cf782f380f2 JavaClass memory optimization (part 2)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3290
diff changeset
   439
!
2cf782f380f2 JavaClass memory optimization (part 2)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3290
diff changeset
   440
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   441
constants
3291
2cf782f380f2 JavaClass memory optimization (part 2)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3290
diff changeset
   442
    ^ constants.
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   443
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   444
    "Created: / 10-05-2011 / 13:48:30 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   445
!
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   446
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   447
constants: aJavaConstantPool
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   448
    constants := aJavaConstantPool.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   449
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   450
    "Created: / 10-05-2011 / 13:48:46 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   451
!
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   452
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   453
stream
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   454
^ inStream.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   455
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   456
    "Created: / 09-05-2011 / 23:22:38 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   457
!
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   458
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   459
stream:aReadStream
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   460
    inStream := aReadStream.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   461
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   462
    "Created: / 09-05-2011 / 23:23:11 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   463
! !
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   464
1
083530508d9c intitial checkin
cg
parents:
diff changeset
   465
!JavaClassReader methodsFor:'file reading'!
083530508d9c intitial checkin
cg
parents:
diff changeset
   466
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   467
readClass: clsName from: path ignoring: classesBeingLoaded
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   468
    "load class named clsName from directory or .jar archive path.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   469
     <clinit> is NOT called, class is NOT installed as global"
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   470
2931
e215dba1f0fb Fix in JavaClassReader for concurrent access to zipa archives.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2914
diff changeset
   471
    | nm  p  zar zarAndRefcount entry  zipFile  read rslt |
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   472
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   473
    p := path asString.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   474
    p asFilename isDirectory ifTrue: [
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   475
        | f |
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   476
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   477
        (p endsWith: Filename separator) ifFalse: [
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   478
            p := p , (Filename separator asString)
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   479
        ].
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   480
        nm := p , clsName , '.class'.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   481
        (f := nm asFilename) exists ifTrue: [
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   482
            (Java isExcludedFromClassPath: nm) ifFalse: [
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   483
                "means we are successfully going to read something :)"
3661
babc6ab26e36 Cleanup: Do not aggresively close and reopen .zip archives
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3626
diff changeset
   484
                f readingFileDo:[:s|rslt := self readStream: s loader: self class classLoaderQuerySignal query ignoring: classesBeingLoaded].
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   485
                rslt notNil ifTrue: [ ^ rslt. ].
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   486
            ]
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   487
        ].
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   488
    ] ifFalse: [
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   489
        ((zipFile := p asFilename withSuffix: 'jar') exists
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   490
            or: [ (zipFile := p asFilename withSuffix: 'zip') exists ])
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   491
                ifTrue: [
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   492
                    "/ Do not use at:ifAbsentPut: here, JavaArchiveCache is a CacheDictionary!!!!!!
2931
e215dba1f0fb Fix in JavaClassReader for concurrent access to zipa archives.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2914
diff changeset
   493
                    JavaArchiveCacheLock critical:[
3661
babc6ab26e36 Cleanup: Do not aggresively close and reopen .zip archives
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3626
diff changeset
   494
                        zarAndRefcount := JavaArchiveCache at: zipFile ifAbsent: [ nil ].
2931
e215dba1f0fb Fix in JavaClassReader for concurrent access to zipa archives.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2914
diff changeset
   495
                        zarAndRefcount isNil ifTrue:[
e215dba1f0fb Fix in JavaClassReader for concurrent access to zipa archives.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2914
diff changeset
   496
                            JavaVM commonOpenStreamUsing:[ zar := ZipArchive oldFileNamed: zipFile ].
e215dba1f0fb Fix in JavaClassReader for concurrent access to zipa archives.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2914
diff changeset
   497
                            JavaArchiveCache at: zipFile put: (zarAndRefcount := Array with: zar with: 1)
e215dba1f0fb Fix in JavaClassReader for concurrent access to zipa archives.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2914
diff changeset
   498
                        ] ifFalse:[
e215dba1f0fb Fix in JavaClassReader for concurrent access to zipa archives.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2914
diff changeset
   499
                            zar := zarAndRefcount first.
e215dba1f0fb Fix in JavaClassReader for concurrent access to zipa archives.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2914
diff changeset
   500
                            zarAndRefcount at: 2 put: (zarAndRefcount at: 2) + 1.
e215dba1f0fb Fix in JavaClassReader for concurrent access to zipa archives.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2914
diff changeset
   501
                        ].
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   502
                    ].
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   503
                    read := [
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   504
                            nm := clsName , '.class'.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   505
2604
b9cb81e47766 Lost changes meant to be commited in 7af1671fc73f.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2602
diff changeset
   506
                            (zar isValidFile: nm) ifTrue: [
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   507
                                (Java isExcludedFromClassPath: nm) ifFalse: [
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   508
                                    entry := zar extract: nm.
3661
babc6ab26e36 Cleanup: Do not aggresively close and reopen .zip archives
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3626
diff changeset
   509
                                    rslt := self readStream: (entry readStream) loader: self class classLoaderQuerySignal query ignoring: classesBeingLoaded.
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   510
                                    rslt notNil ifTrue: [
2931
e215dba1f0fb Fix in JavaClassReader for concurrent access to zipa archives.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2914
diff changeset
   511
                                        JavaArchiveCacheLock critical:[
e215dba1f0fb Fix in JavaClassReader for concurrent access to zipa archives.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2914
diff changeset
   512
                                            zarAndRefcount at: 2 put: (zarAndRefcount at: 2) - 1.
e215dba1f0fb Fix in JavaClassReader for concurrent access to zipa archives.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2914
diff changeset
   513
                                        ].
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   514
                                        ^ rslt
2931
e215dba1f0fb Fix in JavaClassReader for concurrent access to zipa archives.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2914
diff changeset
   515
                                    ].
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   516
                                ]
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   517
                            ].
2931
e215dba1f0fb Fix in JavaClassReader for concurrent access to zipa archives.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2914
diff changeset
   518
                            JavaArchiveCacheLock critical:[
e215dba1f0fb Fix in JavaClassReader for concurrent access to zipa archives.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2914
diff changeset
   519
                                zarAndRefcount at: 2 put: (zarAndRefcount at: 2) - 1.
e215dba1f0fb Fix in JavaClassReader for concurrent access to zipa archives.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2914
diff changeset
   520
                            ].
e215dba1f0fb Fix in JavaClassReader for concurrent access to zipa archives.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2914
diff changeset
   521
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   522
                        ].
3661
babc6ab26e36 Cleanup: Do not aggresively close and reopen .zip archives
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3626
diff changeset
   523
                    JavaClassReader invalidClassFormatSignal         
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   524
                        handle: [
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   525
                            "Kludge, sometimes zar gets corrupted"
2946
5f8f0ac505a5 Fix in JavaClassReader>>#readClass:from:ignoring: (fix wrong code for zar refcounting)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2942
diff changeset
   526
                            JavaArchiveCache at: zipFile put: (Array with: (zar := JavaVM commonOpenStreamUsing: [ZipArchive oldFileNamed: zipFile]) with: 1).
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   527
                            read value
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   528
                        ]
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   529
                        do: [ read value ].
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   530
                ]
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   531
    ].
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   532
    ^nil
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   533
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   534
    "Created: / 03-12-2012 / 22:47:16 / Jan Vrany <jan.vrany@fit.cvut.cz>"
3661
babc6ab26e36 Cleanup: Do not aggresively close and reopen .zip archives
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3626
diff changeset
   535
    "Modified: / 18-11-2016 / 22:57:06 / Jan Vrany <jan.vrany@fit.cvut.cz>"
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   536
!
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   537
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   538
readClass: className ignoring: classesBeingLoadedOrNil classPath: classPath
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   539
    "searches classspath for a class, loads it and returns.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   540
     <clinit> is not called, class is not installed as global"
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   541
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   542
    | rslt  clsName  classesBeingLoaded |
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   543
    clsName := className asSlashedJavaClassName.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   544
    classesBeingLoaded := classesBeingLoadedOrNil.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   545
    classesBeingLoaded isNil ifTrue: [
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   546
        classesBeingLoaded := Set new.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   547
    ].
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   548
    classesBeingLoaded add: clsName.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   549
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   550
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   551
    classPath do: [:path |
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   552
        rslt := self readClass: clsName from: path ignoring: classesBeingLoaded.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   553
        rslt notNil ifTrue:[ ^rslt ].
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   554
    ].
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   555
    ^nil.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   556
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   557
    "Created: / 15-04-1996 / 14:58:53 / cg"
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   558
    "Modified: / 20-10-1998 / 17:24:54 / cg"
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   559
    "Created: / 23-10-2011 / 21:48:20 / Jan Vrany <jan.vrany@fit.cvut.cz>"
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   560
    "Modified: / 03-11-2011 / 18:14:56 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   561
    "Modified: / 14-08-2012 / 02:17:59 / jv"
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   562
    "Modified: / 07-02-2013 / 14:19:18 / Jan Vrany <jan.vrany@fit.cvut.cz>"
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   563
!
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   564
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   565
readClassFileIgnoring: classesbeingLoaded
7
de8ce26e1f2c checkin from browser
cg
parents: 5
diff changeset
   566
    "reads a class from inStream and returns it.
38
3f1b61722466 checkin from browser
cg
parents: 32
diff changeset
   567
     The JavaClass is not installed as global and its constants
3f1b61722466 checkin from browser
cg
parents: 32
diff changeset
   568
     (especially strings) may not be fully resolved."
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   569
3288
90f0566d8145 Extracted readMagic to alow lazy loading of constant pool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3279
diff changeset
   570
    | access_flags  this_class_index  super_class  super_class_index  this_class_ref  existingSuperClass  fields  interfaces  staticFields  nStatic  superClassName  thisClassName  existing_class  thisMetaClass |
90f0566d8145 Extracted readMagic to alow lazy loading of constant pool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3279
diff changeset
   571
90f0566d8145 Extracted readMagic to alow lazy loading of constant pool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3279
diff changeset
   572
    self readMagic.
3289
3aaf43a51816 Extracted magic and version detection into separate methods
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3288
diff changeset
   573
    self readVersion.
3aaf43a51816 Extracted magic and version detection into separate methods
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3288
diff changeset
   574
1
083530508d9c intitial checkin
cg
parents:
diff changeset
   575
    "/
083530508d9c intitial checkin
cg
parents:
diff changeset
   576
    "/ get constant pool
083530508d9c intitial checkin
cg
parents:
diff changeset
   577
    "/
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   578
1
083530508d9c intitial checkin
cg
parents:
diff changeset
   579
    self readConstantPool.
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   580
1
083530508d9c intitial checkin
cg
parents:
diff changeset
   581
    "/
083530508d9c intitial checkin
cg
parents:
diff changeset
   582
    "/ access flags
083530508d9c intitial checkin
cg
parents:
diff changeset
   583
    "/
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   584
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   585
    access_flags := inStream nextUnsignedShortMSB: msb.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   586
    this_class_index := inStream nextUnsignedShortMSB: msb.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   587
    super_class_index := inStream nextUnsignedShortMSB: msb.
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   588
    super_class_index == 0 ifTrue: [ super_class := nil ] ifFalse: [
3291
2cf782f380f2 JavaClass memory optimization (part 2)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3290
diff changeset
   589
        super_class := self constantPoolAt: super_class_index.
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   590
        superClassName := super_class fullName.
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   591
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   592
        "/ special for ST-classes
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   593
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   594
        (superClassName startsWith: 'smalltalk.') ifTrue: [
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   595
            "/ a Smalltalk class
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   596
            superClassName := superClassName copyFrom: 11.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   597
            existingSuperClass := Smalltalk at: superClassName asSymbol.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   598
            existingSuperClass notNil ifTrue: [ super_class := existingSuperClass ] ifFalse: [
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   599
                "/ self halt - must load superclass ...
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   600
            ]
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   601
        ] ifFalse: [
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   602
            "/ a JAVA class
2578
fc6186a4961f Performance optimization: rewrote 'JavaVM classNamed:' to 'JavaVM classNamed:...definedBy:...'.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2566
diff changeset
   603
            super_class := JavaVM classNamed: superClassName definedBy: classLoader.
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   604
            super_class isNil ifTrue: [
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   605
                super_class := self
3291
2cf782f380f2 JavaClass memory optimization (part 2)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3290
diff changeset
   606
                                loadSuperclassIdentifiedBy: (self constantPoolAt: super_class_index)
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   607
                                ignoring: classesbeingLoaded
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   608
            ].
2460
f89d54b4673c class: JavaClassReader
Claus Gittinger <cg@exept.de>
parents: 2428
diff changeset
   609
            super_class isNil ifTrue: [
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   610
                self breakPoint:#jv info: 'Cannot find super class?!!'
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   611
            ].
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   612
        ].
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   613
    ].
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   614
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   615
    "/ If superclass is finalized, mark class so as well.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   616
    (super_class notNil and:[super_class hasFinalize]) ifTrue:[
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   617
        access_flags := access_flags bitOr: ACX_HASFINALIZE
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   618
    ].
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   619
1
083530508d9c intitial checkin
cg
parents:
diff changeset
   620
    "/
083530508d9c intitial checkin
cg
parents:
diff changeset
   621
    "/ get interfaces
083530508d9c intitial checkin
cg
parents:
diff changeset
   622
    "/
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   623
38
3f1b61722466 checkin from browser
cg
parents: 32
diff changeset
   624
    interfaces := self readInterfaces.
3290
76d4443744ed JavaClass memory optimization (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3289
diff changeset
   625
    interfaces do:[:ifaceRefIndex |
3291
2cf782f380f2 JavaClass memory optimization (part 2)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3290
diff changeset
   626
        (self constantPoolAt: ifaceRefIndex) javaClassName = 'java/lang/Cloneable' ifTrue:[
2914
1f4c3054998c Native java.lang.Object#clone() refactored to use ACX_CLOENABLE flag.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2868
diff changeset
   627
            access_flags := access_flags bitOr: ACX_CLONEABLE.
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   628
        ].
2914
1f4c3054998c Native java.lang.Object#clone() refactored to use ACX_CLOENABLE flag.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2868
diff changeset
   629
    ].
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   630
1
083530508d9c intitial checkin
cg
parents:
diff changeset
   631
    "/
083530508d9c intitial checkin
cg
parents:
diff changeset
   632
    "/ get fields
083530508d9c intitial checkin
cg
parents:
diff changeset
   633
    "/
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   634
38
3f1b61722466 checkin from browser
cg
parents: 32
diff changeset
   635
    fields := self readFieldInfofields.
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   636
40
7f332a95e015 checkin from browser
cg
parents: 39
diff changeset
   637
    "/
7f332a95e015 checkin from browser
cg
parents: 39
diff changeset
   638
    "/ create the fields as instVars
7f332a95e015 checkin from browser
cg
parents: 39
diff changeset
   639
    "/ static fields are created as class-InstVars
7f332a95e015 checkin from browser
cg
parents: 39
diff changeset
   640
    "/
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   641
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   642
    staticFields := fields select: [:f | f isStatic ].
40
7f332a95e015 checkin from browser
cg
parents: 39
diff changeset
   643
    nStatic := staticFields size.
3291
2cf782f380f2 JavaClass memory optimization (part 2)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3290
diff changeset
   644
    this_class_ref := self constantPoolAt: this_class_index.
2868
90724c4fa7f8 Fix to recompile erroneous classes upon reload.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2866
diff changeset
   645
    thisClassName := this_class_ref name.
2914
1f4c3054998c Native java.lang.Object#clone() refactored to use ACX_CLOENABLE flag.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2868
diff changeset
   646
    thisClassName = 'java/lang/Cloneable' ifTrue:[
1f4c3054998c Native java.lang.Object#clone() refactored to use ACX_CLOENABLE flag.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2868
diff changeset
   647
        access_flags := access_flags bitOr: ACX_CLONEABLE.
1f4c3054998c Native java.lang.Object#clone() refactored to use ACX_CLOENABLE flag.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2868
diff changeset
   648
    ].
3626
7be362f041a8 Issue #93 [2/3]: Avoid (expensive) test for compilation error at (re)compilation time
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3431
diff changeset
   649
    thisClassName = 'stx/libjava/tools/compiler/CompileError' ifFalse:[ 
7be362f041a8 Issue #93 [2/3]: Avoid (expensive) test for compilation error at (re)compilation time
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3431
diff changeset
   650
        (constants contains: [:entry | entry isJavaClassRef and:[entry name = 'stx/libjava/tools/compiler/CompileError']]) ifTrue:[ 
7be362f041a8 Issue #93 [2/3]: Avoid (expensive) test for compilation error at (re)compilation time
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3431
diff changeset
   651
            access_flags := access_flags bitOr: ACX_HASERRORS.
7be362f041a8 Issue #93 [2/3]: Avoid (expensive) test for compilation error at (re)compilation time
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3431
diff changeset
   652
        ].
7be362f041a8 Issue #93 [2/3]: Avoid (expensive) test for compilation error at (re)compilation time
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3431
diff changeset
   653
    ].
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   654
350
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
   655
    "/ care for smalltalk classes ...
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   656
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   657
    (thisClassName startsWith: 'smalltalk.') ifTrue: [
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   658
        thisClassName := thisClassName copyFrom: 11.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   659
        existing_class := Smalltalk at: thisClassName asSymbol.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   660
        existing_class notNil ifTrue: [
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   661
            self halt: ('overloading existing class: ' , thisClassName).
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   662
            thisClassName := (thisClassName , '_new') asSymbol.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   663
        ].
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   664
        thisMetaClass := Metaclass new.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   665
        thisMetaClass setSuperclass: super_class class.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   666
        thisMetaClass instSize: (super_class class instSize + nStatic).
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   667
        classBeingLoaded := thisMetaClass new.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   668
        classBeingLoaded setSuperclass: super_class.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   669
        classBeingLoaded setName: thisClassName asSymbol.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   670
    ] ifFalse: [
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   671
        "/ a java class
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   672
        Class withoutUpdatingChangesDo:[
2841
6fa1bcf9c997 JavaClass>>#name vs. #binaryName refactoring
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2812
diff changeset
   673
            classBeingLoaded := JavaClass binaryName: thisClassName numStatic: nStatic.
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   674
            classBeingLoaded classLoader: self class classLoaderQuerySignal query.
3626
7be362f041a8 Issue #93 [2/3]: Avoid (expensive) test for compilation error at (re)compilation time
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3431
diff changeset
   675
            fields := fields reject: [:f | f isStatic ].
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   676
            JavaClass setInstanceVariableStringFromFields: staticFields
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   677
                in: classBeingLoaded class.
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   678
            classBeingLoaded setStaticFields: staticFields.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   679
            classBeingLoaded setAccessFlags: access_flags.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   680
            classBeingLoaded setSuperclass: super_class.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   681
            classBeingLoaded setConstantPool: constants.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   682
            classBeingLoaded setFields: fields.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   683
            classBeingLoaded setInterfaces: interfaces.
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   684
        ]
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   685
    ].
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   686
1
083530508d9c intitial checkin
cg
parents:
diff changeset
   687
    "/
083530508d9c intitial checkin
cg
parents:
diff changeset
   688
    "/ get methods
083530508d9c intitial checkin
cg
parents:
diff changeset
   689
    "/
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   690
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   691
    self readMethodsFor: classBeingLoaded.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   692
    self readAttributesFor: classBeingLoaded.
2729
ac412f6ea6d4 More support for method's source display. Not yet working.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2591
diff changeset
   693
    classBeingLoaded setAttributes: attributes.
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   694
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   695
    "/
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   696
    "/ get extensions
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   697
    "/
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   698
    self readExtensionsFor: classBeingLoaded.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   699
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   700
    classBeingLoaded fields do: [:each | self updateOwnerInField: each ].
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   701
    classBeingLoaded staticFields do: [:each | self updateOwnerInField: each ].
2578
fc6186a4961f Performance optimization: rewrote 'JavaVM classNamed:' to 'JavaVM classNamed:...definedBy:...'.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2566
diff changeset
   702
    classBeingLoaded classLoader: classLoader.
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   703
    classesbeingLoaded remove: classBeingLoaded name ifAbsent:[].
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   704
    ^ classBeingLoaded.
5
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
   705
1
083530508d9c intitial checkin
cg
parents:
diff changeset
   706
    "
355
9452f8876652 *** empty log message ***
cg
parents: 353
diff changeset
   707
     JavaClassReader loadFile:'/phys/ibm3/hotjava/classes/browser/AddButton.class'
9452f8876652 *** empty log message ***
cg
parents: 353
diff changeset
   708
     JavaClassReader loadFile:'/phys/ibm3/hotjava/classes/browser/Alignable.class'
9452f8876652 *** empty log message ***
cg
parents: 353
diff changeset
   709
     JavaClassReader loadFile:'foo.cls'
9
bc65152d7610 can no read (undoc) 3.45 format
cg
parents: 7
diff changeset
   710
bc65152d7610 can no read (undoc) 3.45 format
cg
parents: 7
diff changeset
   711
     JavaClassReader verbose:true.
355
9452f8876652 *** empty log message ***
cg
parents: 353
diff changeset
   712
     JavaClassReader loadFile:'/phys/ibm3/hotjava/classes/java/lang/ArithmeticException.class'
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   713
     JavaClassReader loadFile:'/phys/ibm3/java/lib/java/lang/ArithmeticException.class'"
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   714
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   715
    "Created: / 15-04-1996 / 15:02:47 / cg"
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   716
    "Modified: / 12-11-1998 / 21:14:45 / cg"
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   717
    "Modified: / 15-10-2010 / 17:37:38 / Jan Kurs <kurs.jan@post.cz>"
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   718
    "Modified: / 28-01-2011 / 15:09:48 / Marcel Hlopko <hlopik@gmail.com>"
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   719
    "Modified: / 18-05-2011 / 15:30:29 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
3626
7be362f041a8 Issue #93 [2/3]: Avoid (expensive) test for compilation error at (re)compilation time
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3431
diff changeset
   720
    "Modified: / 20-09-2016 / 22:36:25 / Jan Vrany <jan.vrany@fit.cvut.cz>"
3288
90f0566d8145 Extracted readMagic to alow lazy loading of constant pool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3279
diff changeset
   721
!
90f0566d8145 Extracted readMagic to alow lazy loading of constant pool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3279
diff changeset
   722
90f0566d8145 Extracted readMagic to alow lazy loading of constant pool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3279
diff changeset
   723
readMagic
90f0566d8145 Extracted readMagic to alow lazy loading of constant pool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3279
diff changeset
   724
    "Read magic, determine byte order"
90f0566d8145 Extracted readMagic to alow lazy loading of constant pool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3279
diff changeset
   725
    | magic |
90f0566d8145 Extracted readMagic to alow lazy loading of constant pool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3279
diff changeset
   726
90f0566d8145 Extracted readMagic to alow lazy loading of constant pool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3279
diff changeset
   727
    msb := true.
90f0566d8145 Extracted readMagic to alow lazy loading of constant pool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3279
diff changeset
   728
    magic := inStream nextUnsignedLongMSB: true.
90f0566d8145 Extracted readMagic to alow lazy loading of constant pool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3279
diff changeset
   729
    magic = (self class magic_MSB) ifFalse: [
90f0566d8145 Extracted readMagic to alow lazy loading of constant pool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3279
diff changeset
   730
        magic = (self class magic_LSB) ifFalse: [
90f0566d8145 Extracted readMagic to alow lazy loading of constant pool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3279
diff changeset
   731
            InvalidClassFormatSignal raiseErrorString: 'not a java class file'.
90f0566d8145 Extracted readMagic to alow lazy loading of constant pool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3279
diff changeset
   732
            ^ nil
90f0566d8145 Extracted readMagic to alow lazy loading of constant pool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3279
diff changeset
   733
        ].
90f0566d8145 Extracted readMagic to alow lazy loading of constant pool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3279
diff changeset
   734
        msb := false.
90f0566d8145 Extracted readMagic to alow lazy loading of constant pool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3279
diff changeset
   735
    ]
90f0566d8145 Extracted readMagic to alow lazy loading of constant pool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3279
diff changeset
   736
90f0566d8145 Extracted readMagic to alow lazy loading of constant pool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3279
diff changeset
   737
    "Created: / 04-12-2014 / 17:32:07 / Jan Vrany <jan.vrany@fit.cvut.cz>"
5
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
   738
!
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
   739
54
f37bcefb7091 avoid loading classes twice
cg
parents: 52
diff changeset
   740
readStream:aStream ignoring:classesBeingLoaded
2578
fc6186a4961f Performance optimization: rewrote 'JavaVM classNamed:' to 'JavaVM classNamed:...definedBy:...'.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2566
diff changeset
   741
    <resource: #obsolete>
7
de8ce26e1f2c checkin from browser
cg
parents: 5
diff changeset
   742
    "reads a class from aStream and returns it.
de8ce26e1f2c checkin from browser
cg
parents: 5
diff changeset
   743
     The JavaClass is not installed as global"
de8ce26e1f2c checkin from browser
cg
parents: 5
diff changeset
   744
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   745
    ^self readStream:aStream loader: self class classLoaderQuerySignal query ignoring:classesBeingLoaded
2578
fc6186a4961f Performance optimization: rewrote 'JavaVM classNamed:' to 'JavaVM classNamed:...definedBy:...'.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2566
diff changeset
   746
fc6186a4961f Performance optimization: rewrote 'JavaVM classNamed:' to 'JavaVM classNamed:...definedBy:...'.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2566
diff changeset
   747
fc6186a4961f Performance optimization: rewrote 'JavaVM classNamed:' to 'JavaVM classNamed:...definedBy:...'.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2566
diff changeset
   748
    "
fc6186a4961f Performance optimization: rewrote 'JavaVM classNamed:' to 'JavaVM classNamed:...definedBy:...'.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2566
diff changeset
   749
     JavaClassReader readFile:'/phys/ibm3/hotjava/classes/browser/AddButton.class'
fc6186a4961f Performance optimization: rewrote 'JavaVM classNamed:' to 'JavaVM classNamed:...definedBy:...'.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2566
diff changeset
   750
    "
fc6186a4961f Performance optimization: rewrote 'JavaVM classNamed:' to 'JavaVM classNamed:...definedBy:...'.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2566
diff changeset
   751
fc6186a4961f Performance optimization: rewrote 'JavaVM classNamed:' to 'JavaVM classNamed:...definedBy:...'.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2566
diff changeset
   752
    "Created: / 15-04-1996 / 15:00:55 / cg"
fc6186a4961f Performance optimization: rewrote 'JavaVM classNamed:' to 'JavaVM classNamed:...definedBy:...'.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2566
diff changeset
   753
    "Modified: / 02-05-2013 / 09:53:54 / Jan Vrany <jan.vrany@fit.cvut.cz>"
fc6186a4961f Performance optimization: rewrote 'JavaVM classNamed:' to 'JavaVM classNamed:...definedBy:...'.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2566
diff changeset
   754
!
fc6186a4961f Performance optimization: rewrote 'JavaVM classNamed:' to 'JavaVM classNamed:...definedBy:...'.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2566
diff changeset
   755
fc6186a4961f Performance optimization: rewrote 'JavaVM classNamed:' to 'JavaVM classNamed:...definedBy:...'.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2566
diff changeset
   756
readStream:stream loader: classloader ignoring:classesBeingLoaded
fc6186a4961f Performance optimization: rewrote 'JavaVM classNamed:' to 'JavaVM classNamed:...definedBy:...'.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2566
diff changeset
   757
    "reads a class from aStream and returns it.
fc6186a4961f Performance optimization: rewrote 'JavaVM classNamed:' to 'JavaVM classNamed:...definedBy:...'.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2566
diff changeset
   758
     The JavaClass is not installed as global"
fc6186a4961f Performance optimization: rewrote 'JavaVM classNamed:' to 'JavaVM classNamed:...definedBy:...'.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2566
diff changeset
   759
fc6186a4961f Performance optimization: rewrote 'JavaVM classNamed:' to 'JavaVM classNamed:...definedBy:...'.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2566
diff changeset
   760
    inStream := stream.
fc6186a4961f Performance optimization: rewrote 'JavaVM classNamed:' to 'JavaVM classNamed:...definedBy:...'.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2566
diff changeset
   761
    classLoader := classloader.
5
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
   762
    inStream binary.
38
3f1b61722466 checkin from browser
cg
parents: 32
diff changeset
   763
54
f37bcefb7091 avoid loading classes twice
cg
parents: 52
diff changeset
   764
    ^ self readClassFileIgnoring:classesBeingLoaded
5
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
   765
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
   766
    "
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
   767
     JavaClassReader readFile:'/phys/ibm3/hotjava/classes/browser/AddButton.class'
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
   768
    "
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
   769
2578
fc6186a4961f Performance optimization: rewrote 'JavaVM classNamed:' to 'JavaVM classNamed:...definedBy:...'.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2566
diff changeset
   770
    "Created: / 02-05-2013 / 09:52:59 / Jan Vrany <jan.vrany@fit.cvut.cz>"
3289
3aaf43a51816 Extracted magic and version detection into separate methods
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3288
diff changeset
   771
!
3aaf43a51816 Extracted magic and version detection into separate methods
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3288
diff changeset
   772
3aaf43a51816 Extracted magic and version detection into separate methods
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3288
diff changeset
   773
readVersion
3aaf43a51816 Extracted magic and version detection into separate methods
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3288
diff changeset
   774
    minorVsn := inStream nextUnsignedShortMSB: msb.
3aaf43a51816 Extracted magic and version detection into separate methods
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3288
diff changeset
   775
    majorVsn := inStream nextUnsignedShortMSB: msb.
3aaf43a51816 Extracted magic and version detection into separate methods
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3288
diff changeset
   776
    ((self class fileMajorVersions includes: majorVsn) not
3aaf43a51816 Extracted magic and version detection into separate methods
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3288
diff changeset
   777
        or: [ (self class fileMinorVersions includes: minorVsn) not ])
3aaf43a51816 Extracted magic and version detection into separate methods
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3288
diff changeset
   778
            ifTrue: [
3aaf43a51816 Extracted magic and version detection into separate methods
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3288
diff changeset
   779
                | path |
3aaf43a51816 Extracted magic and version detection into separate methods
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3288
diff changeset
   780
3aaf43a51816 Extracted magic and version detection into separate methods
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3288
diff changeset
   781
                path := inStream isFileStream ifTrue:[
3aaf43a51816 Extracted magic and version detection into separate methods
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3288
diff changeset
   782
                    path := inStream pathName
3aaf43a51816 Extracted magic and version detection into separate methods
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3288
diff changeset
   783
                ] ifFalse:[
3aaf43a51816 Extracted magic and version detection into separate methods
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3288
diff changeset
   784
                    path := '<memory>'
3aaf43a51816 Extracted magic and version detection into separate methods
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3288
diff changeset
   785
                ].
3aaf43a51816 Extracted magic and version detection into separate methods
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3288
diff changeset
   786
                Verbose ifTrue:[
3aaf43a51816 Extracted magic and version detection into separate methods
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3288
diff changeset
   787
                    self info:
3aaf43a51816 Extracted magic and version detection into separate methods
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3288
diff changeset
   788
                        ('class reader: file ', path , ' has version ' ,
3aaf43a51816 Extracted magic and version detection into separate methods
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3288
diff changeset
   789
                             majorVsn printString ,
3aaf43a51816 Extracted magic and version detection into separate methods
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3288
diff changeset
   790
                                '.' , minorVsn printString)
3aaf43a51816 Extracted magic and version detection into separate methods
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3288
diff changeset
   791
                ].
3aaf43a51816 Extracted magic and version detection into separate methods
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3288
diff changeset
   792
3aaf43a51816 Extracted magic and version detection into separate methods
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3288
diff changeset
   793
            ].
3aaf43a51816 Extracted magic and version detection into separate methods
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3288
diff changeset
   794
3aaf43a51816 Extracted magic and version detection into separate methods
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3288
diff changeset
   795
    "Created: / 06-12-2014 / 13:37:27 / Jan Vrany <jan.vrany@fit.cvut.cz>"
5
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
   796
! !
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
   797
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
   798
!JavaClassReader methodsFor:'file reading - attributes'!
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
   799
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   800
readAnnotationDefaultAttributeFor:something
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   801
    "/        ('JAVA [info]: unhandled attribute: AnnotationDefault') infoPrintCR.
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   802
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   803
    |len startPos endPos annotationDefault|
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   804
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   805
    self assert:something isJavaMethod
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   806
    message:'AnnotationDefault may only occure for methods!!'.
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   807
    len := inStream nextUnsignedLongMSB:msb.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   808
    startPos := inStream position.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   809
    annotationDefault := (something ensureHasAnnotations)
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   810
                default:(JavaAnnotationDefault new
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   811
                            value:(self readAnnotationValueFor:something));
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   812
                default.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   813
    endPos := inStream position.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   814
    inStream position:startPos.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   815
    annotationDefault bytes:(inStream next:len).
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   816
    self assert:inStream position = endPos
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   817
    message:'self readAnnotationValueFor: something is reading what it shouldn'.
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   818
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   819
    "Modified: / 28-02-2011 / 17:08:28 / Marcel Hlopko <hlopik@gmail.com>"
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   820
    "Modified: / 03-03-2011 / 23:06:27 / Jan Vrany <jan.vrany@fit.cvut.cz>"
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   821
!
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   822
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   823
readAnnotationFor:something
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   824
    | typeIndex  type  result  attrsCount |
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   825
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   826
    typeIndex := inStream nextUnsignedShortMSB:msb.
3291
2cf782f380f2 JavaClass memory optimization (part 2)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3290
diff changeset
   827
    type := self constantPoolAt:typeIndex.
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   828
    attrsCount := inStream nextUnsignedShortMSB:msb.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   829
    result := JavaAnnotation for:something.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   830
    result name:type.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   831
    attrsCount timesRepeat:
3385
58d72cc6d5f6 Replaced old-style `'string' infoPrintCR` logging with new-style `Logger log:'string'` logging
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3384
diff changeset
   832
            [ | nameIndex  name attr |
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   833
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   834
            nameIndex := inStream nextUnsignedShortMSB:msb.
3291
2cf782f380f2 JavaClass memory optimization (part 2)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3290
diff changeset
   835
            name := self constantPoolAt:nameIndex.
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   836
            attr := self readAnnotationValueFor:something.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   837
            attr name:name.
3294
1013708261a8 JavaClass memory optimization (part 5)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3293
diff changeset
   838
            result values at: name put:attr.
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   839
            AnnotationsVerbose
3385
58d72cc6d5f6 Replaced old-style `'string' infoPrintCR` logging with new-style `Logger log:'string'` logging
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3384
diff changeset
   840
                ifTrue:[ Logger 
58d72cc6d5f6 Replaced old-style `'string' infoPrintCR` logging with new-style `Logger log:'string'` logging
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3384
diff changeset
   841
                               log:('JAVA [INFO]: Reading annotation attribute: ' , name)
58d72cc6d5f6 Replaced old-style `'string' infoPrintCR` logging with new-style `Logger log:'string'` logging
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3384
diff changeset
   842
                               severity:Logger severityDEBUG
58d72cc6d5f6 Replaced old-style `'string' infoPrintCR` logging with new-style `Logger log:'string'` logging
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3384
diff changeset
   843
                               facility:#JVM. ]. ].
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   844
    ^ result.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   845
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   846
    "Created: / 17-12-2010 / 16:21:28 / Marcel Hlopko <hlopik@gmail.com>"
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   847
    "Modified: / 25-02-2011 / 12:25:36 / Marcel Hlopko <hlopik@gmail.com>"
3294
1013708261a8 JavaClass memory optimization (part 5)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3293
diff changeset
   848
    "Modified: / 08-12-2014 / 16:23:00 / Jan Vrany <jan.vrany@fit.cvut.cz>"
3385
58d72cc6d5f6 Replaced old-style `'string' infoPrintCR` logging with new-style `Logger log:'string'` logging
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3384
diff changeset
   849
    "Modified (format): / 02-03-2015 / 16:04:28 / Jan Vrany <jan.vrany@fit.cvut.cz>"
2148
b51eb5830f48 added:11 methods
Claus Gittinger <cg@exept.de>
parents: 2142
diff changeset
   850
!
b51eb5830f48 added:11 methods
Claus Gittinger <cg@exept.de>
parents: 2142
diff changeset
   851
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   852
readAnnotationValueFor:something
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   853
    | tag  result |
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   854
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   855
    tag := (inStream nextByte) asCharacter.
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   856
    tag = $e
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   857
        ifTrue:
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   858
            [ result := JavaAnnotationEnumValue for:something.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   859
            result nameIndex:(inStream nextUnsignedShortMSB:msb).
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   860
            result valueIndex:(inStream nextUnsignedShortMSB:msb).
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   861
            AnnotationsVerbose
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   862
                ifTrue:
3385
58d72cc6d5f6 Replaced old-style `'string' infoPrintCR` logging with new-style `Logger log:'string'` logging
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3384
diff changeset
   863
                    [ Logger 
58d72cc6d5f6 Replaced old-style `'string' infoPrintCR` logging with new-style `Logger log:'string'` logging
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3384
diff changeset
   864
                            log:('JAVA [INFO]: Reading annotation enum value: ' 
58d72cc6d5f6 Replaced old-style `'string' infoPrintCR` logging with new-style `Logger log:'string'` logging
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3384
diff changeset
   865
                                    , result name printString , ' -> ' 
58d72cc6d5f6 Replaced old-style `'string' infoPrintCR` logging with new-style `Logger log:'string'` logging
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3384
diff changeset
   866
                                    , result value printString)
58d72cc6d5f6 Replaced old-style `'string' infoPrintCR` logging with new-style `Logger log:'string'` logging
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3384
diff changeset
   867
                            severity:Logger severityDEBUG
58d72cc6d5f6 Replaced old-style `'string' infoPrintCR` logging with new-style `Logger log:'string'` logging
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3384
diff changeset
   868
                            facility:#JVM ].
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   869
            ^ result ].
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   870
    tag = $c
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   871
        ifTrue:
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   872
            [ result := JavaAnnotationClassValue for:something.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   873
            result classIndex:(inStream nextUnsignedShortMSB:msb).
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   874
            AnnotationsVerbose
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   875
                ifTrue:
3385
58d72cc6d5f6 Replaced old-style `'string' infoPrintCR` logging with new-style `Logger log:'string'` logging
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3384
diff changeset
   876
                    [ Logger 
58d72cc6d5f6 Replaced old-style `'string' infoPrintCR` logging with new-style `Logger log:'string'` logging
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3384
diff changeset
   877
                            log:('JAVA [INFO]: Reading annotation class value: ' 
58d72cc6d5f6 Replaced old-style `'string' infoPrintCR` logging with new-style `Logger log:'string'` logging
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3384
diff changeset
   878
                                    , result name printString , ' -> ' 
58d72cc6d5f6 Replaced old-style `'string' infoPrintCR` logging with new-style `Logger log:'string'` logging
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3384
diff changeset
   879
                                    , result value printString)
58d72cc6d5f6 Replaced old-style `'string' infoPrintCR` logging with new-style `Logger log:'string'` logging
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3384
diff changeset
   880
                            severity:Logger severityDEBUG
58d72cc6d5f6 Replaced old-style `'string' infoPrintCR` logging with new-style `Logger log:'string'` logging
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3384
diff changeset
   881
                            facility:#JVM ].
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   882
            ^ result ].
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   883
    tag = $@
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   884
        ifTrue:
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   885
            [ result := JavaAnnotationNestedAnnotationValue for:something.
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   886
            result nestedAnnotation:(self readAnnotationFor: something).
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   887
            AnnotationsVerbose
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   888
                ifTrue:
3385
58d72cc6d5f6 Replaced old-style `'string' infoPrintCR` logging with new-style `Logger log:'string'` logging
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3384
diff changeset
   889
                    [ Logger 
58d72cc6d5f6 Replaced old-style `'string' infoPrintCR` logging with new-style `Logger log:'string'` logging
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3384
diff changeset
   890
                            log:('JAVA [INFO]: Reading annotation nested annotation value: ' 
58d72cc6d5f6 Replaced old-style `'string' infoPrintCR` logging with new-style `Logger log:'string'` logging
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3384
diff changeset
   891
                                    , result name printString , ' -> ' 
58d72cc6d5f6 Replaced old-style `'string' infoPrintCR` logging with new-style `Logger log:'string'` logging
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3384
diff changeset
   892
                                    , result value printString)
58d72cc6d5f6 Replaced old-style `'string' infoPrintCR` logging with new-style `Logger log:'string'` logging
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3384
diff changeset
   893
                            severity:Logger severityDEBUG
58d72cc6d5f6 Replaced old-style `'string' infoPrintCR` logging with new-style `Logger log:'string'` logging
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3384
diff changeset
   894
                            facility:#JVM ].
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   895
            ^ result ].
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   896
    tag = $[
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   897
        ifTrue:
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   898
            [ result := JavaAnnotationArrayValue for:something.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   899
            result count:(inStream nextUnsignedShortMSB:msb).
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   900
            AnnotationsVerbose
3385
58d72cc6d5f6 Replaced old-style `'string' infoPrintCR` logging with new-style `Logger log:'string'` logging
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3384
diff changeset
   901
                ifTrue:[ Logger 
58d72cc6d5f6 Replaced old-style `'string' infoPrintCR` logging with new-style `Logger log:'string'` logging
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3384
diff changeset
   902
                               log:('JAVA [INFO]: Reading annotation array value')
58d72cc6d5f6 Replaced old-style `'string' infoPrintCR` logging with new-style `Logger log:'string'` logging
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3384
diff changeset
   903
                               severity:Logger severityDEBUG
58d72cc6d5f6 Replaced old-style `'string' infoPrintCR` logging with new-style `Logger log:'string'` logging
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3384
diff changeset
   904
                               facility:#JVM ].
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   905
            1 to:result count
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   906
                do:[:index | result values at:index put:(self readAnnotationValueFor:something) ].
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   907
            AnnotationsVerbose
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   908
                ifTrue:
3385
58d72cc6d5f6 Replaced old-style `'string' infoPrintCR` logging with new-style `Logger log:'string'` logging
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3384
diff changeset
   909
                    [ Logger 
58d72cc6d5f6 Replaced old-style `'string' infoPrintCR` logging with new-style `Logger log:'string'` logging
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3384
diff changeset
   910
                            log:('JAVA [INFO]: Finished reading annotation array value: ' 
58d72cc6d5f6 Replaced old-style `'string' infoPrintCR` logging with new-style `Logger log:'string'` logging
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3384
diff changeset
   911
                                    , result value printString)
58d72cc6d5f6 Replaced old-style `'string' infoPrintCR` logging with new-style `Logger log:'string'` logging
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3384
diff changeset
   912
                            severity:Logger severityDEBUG
58d72cc6d5f6 Replaced old-style `'string' infoPrintCR` logging with new-style `Logger log:'string'` logging
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3384
diff changeset
   913
                            facility:#JVM ].
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   914
            ^ result ].
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   915
    result := JavaAnnotationPrimitiveValue for:something.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   916
    result valueIndex:(inStream nextUnsignedShortMSB:msb).
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   917
     AnnotationsVerbose
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   918
                ifTrue:
3385
58d72cc6d5f6 Replaced old-style `'string' infoPrintCR` logging with new-style `Logger log:'string'` logging
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3384
diff changeset
   919
                    [ Logger 
58d72cc6d5f6 Replaced old-style `'string' infoPrintCR` logging with new-style `Logger log:'string'` logging
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3384
diff changeset
   920
                            log:('JAVA [INFO]: Finished reading annotation primitive value: ' 
58d72cc6d5f6 Replaced old-style `'string' infoPrintCR` logging with new-style `Logger log:'string'` logging
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3384
diff changeset
   921
                                    , result name printString , ' -> ' 
58d72cc6d5f6 Replaced old-style `'string' infoPrintCR` logging with new-style `Logger log:'string'` logging
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3384
diff changeset
   922
                                    , result value printString)
58d72cc6d5f6 Replaced old-style `'string' infoPrintCR` logging with new-style `Logger log:'string'` logging
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3384
diff changeset
   923
                            severity:Logger severityDEBUG
58d72cc6d5f6 Replaced old-style `'string' infoPrintCR` logging with new-style `Logger log:'string'` logging
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3384
diff changeset
   924
                            facility:#JVM ].
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   925
    ^ result.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   926
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   927
    "Created: / 17-12-2010 / 16:44:14 / Marcel Hlopko <hlopik@gmail.com>"
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   928
    "Modified: / 28-02-2011 / 16:12:09 / Marcel Hlopko <hlopik@gmail.com>"
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   929
    "Modified: / 12-02-2013 / 19:35:15 / Marcel Hlopko <marcel.hlopko@fit.cvut.cz>"
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   930
!
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   931
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   932
readAttribute:attributeName for:something
2148
b51eb5830f48 added:11 methods
Claus Gittinger <cg@exept.de>
parents: 2142
diff changeset
   933
    "/ implemented JAVA attributes
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   934
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   935
    (attributeName = 'ConstantValue')
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   936
        ifTrue:
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   937
            [ self readConstantValueAttributeFor:something.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   938
            ^ self. ].
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   939
    (attributeName = 'Code')
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   940
        ifTrue:
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   941
            [ self readCodeAttributeFor:something.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   942
            ^ self. ].
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   943
    (attributeName = 'Exceptions')
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   944
        ifTrue:
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   945
            [ self readExceptionsAttributeFor:something.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   946
            ^ self. ].
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   947
    (attributeName = 'InnerClasses')
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   948
        ifTrue:
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   949
            [ self readInnerClassesAttributeFor:something.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   950
            ^ self. ].
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   951
    (attributeName = 'EnclosingMethod')
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   952
        ifTrue:
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   953
            [ self readEnclosingMethodAttributeFor:something.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   954
            ^ self. ].
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   955
    (attributeName = 'LineNumberTable')
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   956
        ifTrue:
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   957
            [ self readLineNumberTableAttributeFor:something.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   958
            ^ self. ].
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   959
    (attributeName = 'LocalVariableTable')
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   960
        ifTrue:
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   961
            [ self readLocalVariableTableAttributeFor:something.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   962
            ^ self. ].
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   963
    (attributeName = 'LocalVariableTypeTable')
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   964
        ifTrue:
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   965
            [ self readLocalVariableTypeTableAttributeFor:something.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   966
            ^ self. ].
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   967
    (attributeName = 'SourceFile')
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   968
        ifTrue:
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   969
            [ self readSourceFileAttributeFor:something.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   970
            ^ self. ].
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   971
    (attributeName = 'SourceDebugExtension')
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   972
        ifTrue:
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   973
            [ self readSourceDebugExtensionAttributeFor:something.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   974
            ^ self. ].
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   975
    (attributeName = 'Synthetic')
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   976
        ifTrue:
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   977
            [ self readSyntheticAttributeFor:something.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   978
            ^ self. ].
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   979
    (attributeName = 'Signature')
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   980
        ifTrue:
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   981
            [ self readSignatureAttributeFor:something.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   982
            ^ self. ].
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   983
    (attributeName = 'Deprecated')
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   984
        ifTrue:
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   985
            [ self readDeprecatedAttributeFor:something.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   986
            ^ self. ].
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   987
    (attributeName = 'RuntimeVisibleAnnotations')
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   988
        ifTrue:
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   989
            [ self readRuntimeAnnotationsAttributeFor:something visible:true.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   990
            ^ self. ].
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   991
    (attributeName = 'RuntimeInvisibleAnnotations')
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   992
        ifTrue:
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   993
            [  self readRuntimeAnnotationsAttributeFor:something visible:false.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   994
            ^ self. ].
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   995
    (attributeName = 'RuntimeVisibleParameterAnnotations')
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   996
        ifTrue:
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   997
            [ self readRuntimeParameterAnnotationsAttributeFor:something visible:true.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   998
            ^ self. ].
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   999
    (attributeName = 'RuntimeInvisibleParameterAnnotations')
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1000
        ifTrue:
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1001
            [ self readRuntimeParameterAnnotationsAttributeFor:something visible:false.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1002
            ^ self. ].
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  1003
    (attributeName = 'AnnotationDefault')
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1004
        ifTrue:
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1005
            [ self readAnnotationDefaultAttributeFor:something.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1006
            ^ self. ].
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  1007
2148
b51eb5830f48 added:11 methods
Claus Gittinger <cg@exept.de>
parents: 2142
diff changeset
  1008
    "/ ignored JAVA attributes
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  1009
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  1010
    (attributeName = 'FastJavac1.0')
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1011
        ifTrue:
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1012
            [ "/        ('JAVA [info]: unhandled attribute: ' , attributeName) infoPrintCR.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1013
            self skipAttribute:attributeName.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1014
            ^ self. ].
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  1015
    (attributeName = 'AbsoluteSourcePath')
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1016
        ifTrue:
3385
58d72cc6d5f6 Replaced old-style `'string' infoPrintCR` logging with new-style `Logger log:'string'` logging
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3384
diff changeset
  1017
            [ "/        ('JAVA [info]: unhandled attribute: ' , attributeName) infoPrintCR.
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1018
            self skipAttribute:attributeName.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1019
            ^ self. ].
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  1020
    (attributeName startsWith:((Character value:13) asString , 'WARNING:'))
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1021
        ifTrue:
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1022
            [ "/        ('JAVA [info]: unhandled attribute: ' , attributeName) infoPrintCR.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1023
            self skipAttribute:attributeName.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1024
            ^ self. ].
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  1025
    (attributeName = 'StackMapTable')
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1026
        ifTrue:
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1027
            [ "/        ('JAVA [info]: unhandled attribute: ' , attributeName) infoPrintCR.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1028
            self readStackMapTableAttributeFor:something.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1029
            ^ self. ].
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  1030
2089
f90b44f9c9e0 utf8 string decoding
Claus Gittinger <cg@exept.de>
parents: 749
diff changeset
  1031
    "/ implemented ST attributes
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  1032
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  1033
    (attributeName = 'STLiterals')
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1034
        ifTrue:
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1035
            [ self readSTLiteralsAttributeFor:something.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1036
            ^ self. ].
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  1037
    (attributeName = 'ClassRevision')
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1038
        ifTrue:
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1039
            [ self readSTClassRevisionAttributeFor:something.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1040
            ^ self. ].
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  1041
    (attributeName = 'ClassPackage')
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1042
        ifTrue:
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1043
            [ self readSTClassPackageAttributeFor:something.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1044
            ^ self. ].
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  1045
    (attributeName = 'ClassCategory')
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1046
        ifTrue:
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1047
            [ self readSTClassCategoryAttributeFor:something.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1048
            ^ self. ].
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  1049
    (attributeName = 'ClassVarNames')
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1050
        ifTrue:
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1051
            [ self readSTClassVarNamesAttributeFor:something.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1052
            ^ self. ].
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  1053
    (attributeName = 'ClassInstVarNames')
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1054
        ifTrue:
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1055
            [ self readSTClassInstVarNamesAttributeFor:something.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1056
            ^ self. ].
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  1057
    (attributeName = 'InstVarNames')
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1058
        ifTrue:
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1059
            [ self readSTInstVarNamesAttributeFor:something.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1060
            ^ self. ].
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  1061
    (attributeName = 'STCode')
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1062
        ifTrue:
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1063
            [ self readSTCodeAttributeFor:something.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1064
            ^ self. ].
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  1065
    (attributeName = 'MethodCategory')
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1066
        ifTrue:
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1067
            [ self readSTMethodCategoryAttributeFor:something.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1068
            ^ self. ].
2866
d92f88db7514 Improved JavaClassReader to read InnerClasses and MissingTypes attributes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2841
diff changeset
  1069
d92f88db7514 Improved JavaClassReader to read InnerClasses and MissingTypes attributes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2841
diff changeset
  1070
    "/ Eclipse Java Compiler Specific Attributes
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  1071
    (attributeName = 'MissingTypes')
2866
d92f88db7514 Improved JavaClassReader to read InnerClasses and MissingTypes attributes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2841
diff changeset
  1072
        ifTrue:
d92f88db7514 Improved JavaClassReader to read InnerClasses and MissingTypes attributes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2841
diff changeset
  1073
            [ self readMissingTypesAttributeFor:something.
d92f88db7514 Improved JavaClassReader to read InnerClasses and MissingTypes attributes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2841
diff changeset
  1074
            ^ self. ].
d92f88db7514 Improved JavaClassReader to read InnerClasses and MissingTypes attributes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2841
diff changeset
  1075
355
9452f8876652 *** empty log message ***
cg
parents: 353
diff changeset
  1076
    "/ unknown attributes
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  1077
3385
58d72cc6d5f6 Replaced old-style `'string' infoPrintCR` logging with new-style `Logger log:'string'` logging
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3384
diff changeset
  1078
    Logger 
58d72cc6d5f6 Replaced old-style `'string' infoPrintCR` logging with new-style `Logger log:'string'` logging
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3384
diff changeset
  1079
          log:('JAVA [warning]: unrecognized attribute: ' , attributeName)
58d72cc6d5f6 Replaced old-style `'string' infoPrintCR` logging with new-style `Logger log:'string'` logging
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3384
diff changeset
  1080
          severity:Logger severityDEBUG
58d72cc6d5f6 Replaced old-style `'string' infoPrintCR` logging with new-style `Logger log:'string'` logging
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3384
diff changeset
  1081
          facility:#JVM.
333
1622ff2b686b checkin from browser
cg
parents: 330
diff changeset
  1082
    self skipAttribute:attributeName.
5
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
  1083
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1084
    "Modified: / 03-12-1998 / 13:13:42 / cg"
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1085
    "Modified: / 25-02-2011 / 18:09:21 / Marcel Hlopko <hlopik@gmail.com>"
3385
58d72cc6d5f6 Replaced old-style `'string' infoPrintCR` logging with new-style `Logger log:'string'` logging
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3384
diff changeset
  1086
    "Modified: / 02-03-2015 / 16:04:07 / Jan Vrany <jan.vrany@fit.cvut.cz>"
5
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
  1087
!
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
  1088
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
  1089
readAttributeFor:something
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
  1090
    |attribute_name_index attribute_name attribute_length attribute_info|
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
  1091
61
ff1579eb825f showCr: -> showCR:
cg
parents: 60
diff changeset
  1092
    Verbose ifTrue:[Transcript show:'attrib at pos: '; showCR:inStream position].
9
bc65152d7610 can no read (undoc) 3.45 format
cg
parents: 7
diff changeset
  1093
128
acc4e8e77092 *** empty log message ***
cg
parents: 122
diff changeset
  1094
    attribute_name_index := inStream nextUnsignedShortMSB:msb.
2142
4836ff0780cd *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2115
diff changeset
  1095
    attribute_name_index == 0 ifTrue:[
4836ff0780cd *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2115
diff changeset
  1096
        self halt.
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1097
        "/self skipAttribute:'unnamed'.
2142
4836ff0780cd *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2115
diff changeset
  1098
        ^ self.
4836ff0780cd *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2115
diff changeset
  1099
    ].
9
bc65152d7610 can no read (undoc) 3.45 format
cg
parents: 7
diff changeset
  1100
bc65152d7610 can no read (undoc) 3.45 format
cg
parents: 7
diff changeset
  1101
    "/
bc65152d7610 can no read (undoc) 3.45 format
cg
parents: 7
diff changeset
  1102
    "/ UNDOC feature ?
bc65152d7610 can no read (undoc) 3.45 format
cg
parents: 7
diff changeset
  1103
    "/
bc65152d7610 can no read (undoc) 3.45 format
cg
parents: 7
diff changeset
  1104
    attribute_name_index > constants size ifTrue:[
333
1622ff2b686b checkin from browser
cg
parents: 330
diff changeset
  1105
        attribute_name_index == 16rb700 ifTrue:[
1622ff2b686b checkin from browser
cg
parents: 330
diff changeset
  1106
            self halt.
1622ff2b686b checkin from browser
cg
parents: 330
diff changeset
  1107
        ]
9
bc65152d7610 can no read (undoc) 3.45 format
cg
parents: 7
diff changeset
  1108
    ].
bc65152d7610 can no read (undoc) 3.45 format
cg
parents: 7
diff changeset
  1109
3291
2cf782f380f2 JavaClass memory optimization (part 2)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3290
diff changeset
  1110
    attribute_name := self constantPoolAt:attribute_name_index.
9
bc65152d7610 can no read (undoc) 3.45 format
cg
parents: 7
diff changeset
  1111
61
ff1579eb825f showCr: -> showCR:
cg
parents: 60
diff changeset
  1112
    Verbose ifTrue:[Transcript show:'attrib name: '; showCR:attribute_name].
9
bc65152d7610 can no read (undoc) 3.45 format
cg
parents: 7
diff changeset
  1113
333
1622ff2b686b checkin from browser
cg
parents: 330
diff changeset
  1114
    self readAttribute:attribute_name for:something.
5
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
  1115
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
  1116
    "
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
  1117
     JavaClassReader readFile:'/phys/ibm3/hotjava/classes/browser/AddButton.class'
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
  1118
    "
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
  1119
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1120
    "Created: / 15-04-1996 / 15:40:17 / cg"
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1121
    "Modified: / 09-04-1998 / 18:13:34 / cg"
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1122
    "Modified: / 19-10-2010 / 21:43:30 / Jan Vrany <jan.vrany@fit.cvut.cz>"
5
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
  1123
!
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
  1124
3290
76d4443744ed JavaClass memory optimization (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3289
diff changeset
  1125
readAttributeLength
76d4443744ed JavaClass memory optimization (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3289
diff changeset
  1126
    ^ inStream nextUnsignedLongMSB:msb
76d4443744ed JavaClass memory optimization (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3289
diff changeset
  1127
76d4443744ed JavaClass memory optimization (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3289
diff changeset
  1128
    "Created: / 03-12-2014 / 12:53:46 / Jan Vrany <jan.vrany@fit.cvut.cz>"
76d4443744ed JavaClass memory optimization (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3289
diff changeset
  1129
!
76d4443744ed JavaClass memory optimization (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3289
diff changeset
  1130
5
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
  1131
readAttributesFor:something
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
  1132
    |attributes_count|
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
  1133
128
acc4e8e77092 *** empty log message ***
cg
parents: 122
diff changeset
  1134
    attributes_count := inStream nextUnsignedShortMSB:msb.
2729
ac412f6ea6d4 More support for method's source display. Not yet working.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2591
diff changeset
  1135
    attributes := OrderedCollection new: attributes_count * 2.
5
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
  1136
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
  1137
    1 to:attributes_count do:[:i |
2729
ac412f6ea6d4 More support for method's source display. Not yet working.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2591
diff changeset
  1138
        self readAttributeFor:something.
5
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
  1139
    ].
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
  1140
2729
ac412f6ea6d4 More support for method's source display. Not yet working.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2591
diff changeset
  1141
    "Created: / 15-04-1996 / 15:40:17 / cg"
ac412f6ea6d4 More support for method's source display. Not yet working.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2591
diff changeset
  1142
    "Modified: / 13-09-2013 / 01:01:28 / Jan Vrany <jan.vrany@fit.cvut.cz>"
333
1622ff2b686b checkin from browser
cg
parents: 330
diff changeset
  1143
!
1622ff2b686b checkin from browser
cg
parents: 330
diff changeset
  1144
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1145
readDeprecatedAttributeFor:aJavaMethodWithHandler
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1146
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1147
    self skipAttribute:'Deprecated'.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1148
    ^self
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1149
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1150
    "Created: / 18-10-2010 / 22:26:17 / Jan Vrany <jan.vrany@fit.cvut.cz>"
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1151
!
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1152
2148
b51eb5830f48 added:11 methods
Claus Gittinger <cg@exept.de>
parents: 2142
diff changeset
  1153
readEnclosingMethodAttributeFor:something
3290
76d4443744ed JavaClass memory optimization (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3289
diff changeset
  1154
    | class_ref_index method_ref_index |
76d4443744ed JavaClass memory optimization (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3289
diff changeset
  1155
76d4443744ed JavaClass memory optimization (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3289
diff changeset
  1156
    self skipAttributeLength.
76d4443744ed JavaClass memory optimization (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3289
diff changeset
  1157
    class_ref_index := inStream nextUnsignedShortMSB:msb.
76d4443744ed JavaClass memory optimization (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3289
diff changeset
  1158
    method_ref_index := inStream nextUnsignedShortMSB:msb.
76d4443744ed JavaClass memory optimization (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3289
diff changeset
  1159
    attributes add: #EnclosingMethod; add: (Array with: class_ref_index with: method_ref_index)
76d4443744ed JavaClass memory optimization (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3289
diff changeset
  1160
76d4443744ed JavaClass memory optimization (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3289
diff changeset
  1161
    "Modified: / 03-12-2014 / 12:56:05 / Jan Vrany <jan.vrany@fit.cvut.cz>"
2148
b51eb5830f48 added:11 methods
Claus Gittinger <cg@exept.de>
parents: 2142
diff changeset
  1162
!
b51eb5830f48 added:11 methods
Claus Gittinger <cg@exept.de>
parents: 2142
diff changeset
  1163
b51eb5830f48 added:11 methods
Claus Gittinger <cg@exept.de>
parents: 2142
diff changeset
  1164
readInnerClassesAttributeFor:something
2866
d92f88db7514 Improved JavaClassReader to read InnerClasses and MissingTypes attributes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2841
diff changeset
  1165
    | attribute_length number_of_classes classes |
d92f88db7514 Improved JavaClassReader to read InnerClasses and MissingTypes attributes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2841
diff changeset
  1166
d92f88db7514 Improved JavaClassReader to read InnerClasses and MissingTypes attributes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2841
diff changeset
  1167
    attribute_length := inStream nextUnsignedLongMSB:msb. "/ skip attribute length.
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  1168
    number_of_classes := inStream nextUnsignedShortMSB:msb.
2866
d92f88db7514 Improved JavaClassReader to read InnerClasses and MissingTypes attributes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2841
diff changeset
  1169
    classes := JavaInnerClasses new: number_of_classes.
d92f88db7514 Improved JavaClassReader to read InnerClasses and MissingTypes attributes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2841
diff changeset
  1170
    self assert: attribute_length == ((number_of_classes * 8) + 2).
d92f88db7514 Improved JavaClassReader to read InnerClasses and MissingTypes attributes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2841
diff changeset
  1171
    1 to: number_of_classes do:[:i |
3290
76d4443744ed JavaClass memory optimization (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3289
diff changeset
  1172
        | entry |
2866
d92f88db7514 Improved JavaClassReader to read InnerClasses and MissingTypes attributes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2841
diff changeset
  1173
d92f88db7514 Improved JavaClassReader to read InnerClasses and MissingTypes attributes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2841
diff changeset
  1174
        entry := JavaInnerClasses::Entry new.
3290
76d4443744ed JavaClass memory optimization (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3289
diff changeset
  1175
        entry setInnerClassRefIndex:(inStream nextUnsignedShortMSB:msb).
76d4443744ed JavaClass memory optimization (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3289
diff changeset
  1176
        entry setOuterClassRefIndex:(inStream nextUnsignedShortMSB:msb).
76d4443744ed JavaClass memory optimization (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3289
diff changeset
  1177
        entry setNameIndex: (inStream nextUnsignedShortMSB:msb).
2866
d92f88db7514 Improved JavaClassReader to read InnerClasses and MissingTypes attributes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2841
diff changeset
  1178
        entry setAccessFlags: (inStream nextUnsignedShortMSB:msb).
d92f88db7514 Improved JavaClassReader to read InnerClasses and MissingTypes attributes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2841
diff changeset
  1179
        classes at: i put:  entry
d92f88db7514 Improved JavaClassReader to read InnerClasses and MissingTypes attributes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2841
diff changeset
  1180
    ].
d92f88db7514 Improved JavaClassReader to read InnerClasses and MissingTypes attributes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2841
diff changeset
  1181
d92f88db7514 Improved JavaClassReader to read InnerClasses and MissingTypes attributes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2841
diff changeset
  1182
    attributes add: #InnerClasses; add: classes.
d92f88db7514 Improved JavaClassReader to read InnerClasses and MissingTypes attributes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2841
diff changeset
  1183
3290
76d4443744ed JavaClass memory optimization (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3289
diff changeset
  1184
    "Modified: / 03-12-2014 / 14:06:46 / Jan Vrany <jan.vrany@fit.cvut.cz>"
2148
b51eb5830f48 added:11 methods
Claus Gittinger <cg@exept.de>
parents: 2142
diff changeset
  1185
!
b51eb5830f48 added:11 methods
Claus Gittinger <cg@exept.de>
parents: 2142
diff changeset
  1186
b51eb5830f48 added:11 methods
Claus Gittinger <cg@exept.de>
parents: 2142
diff changeset
  1187
readLocalVariableTypeTableAttributeFor:something
b51eb5830f48 added:11 methods
Claus Gittinger <cg@exept.de>
parents: 2142
diff changeset
  1188
"/        ('JAVA [info]: unhandled attribute: LocalVariableTypeTable') infoPrintCR.
b51eb5830f48 added:11 methods
Claus Gittinger <cg@exept.de>
parents: 2142
diff changeset
  1189
        self skipAttribute:'LocalVariableTypeTable'.
b51eb5830f48 added:11 methods
Claus Gittinger <cg@exept.de>
parents: 2142
diff changeset
  1190
!
b51eb5830f48 added:11 methods
Claus Gittinger <cg@exept.de>
parents: 2142
diff changeset
  1191
2866
d92f88db7514 Improved JavaClassReader to read InnerClasses and MissingTypes attributes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2841
diff changeset
  1192
readMissingTypesAttributeFor:something
d92f88db7514 Improved JavaClassReader to read InnerClasses and MissingTypes attributes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2841
diff changeset
  1193
    | attribute_length numMissingTypes missingTypes |
d92f88db7514 Improved JavaClassReader to read InnerClasses and MissingTypes attributes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2841
diff changeset
  1194
d92f88db7514 Improved JavaClassReader to read InnerClasses and MissingTypes attributes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2841
diff changeset
  1195
    attribute_length := inStream nextUnsignedLongMSB:msb. "/ skip attribute length.
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  1196
    numMissingTypes := inStream nextUnsignedShortMSB:msb.
2866
d92f88db7514 Improved JavaClassReader to read InnerClasses and MissingTypes attributes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2841
diff changeset
  1197
    missingTypes := Array new: numMissingTypes.
d92f88db7514 Improved JavaClassReader to read InnerClasses and MissingTypes attributes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2841
diff changeset
  1198
    self assert: attribute_length == ((numMissingTypes * 2) + 2).
d92f88db7514 Improved JavaClassReader to read InnerClasses and MissingTypes attributes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2841
diff changeset
  1199
    1 to: numMissingTypes do:[: i |
3290
76d4443744ed JavaClass memory optimization (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3289
diff changeset
  1200
        missingTypes at: i put: (inStream nextUnsignedShortMSB:msb)
2866
d92f88db7514 Improved JavaClassReader to read InnerClasses and MissingTypes attributes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2841
diff changeset
  1201
    ].
d92f88db7514 Improved JavaClassReader to read InnerClasses and MissingTypes attributes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2841
diff changeset
  1202
d92f88db7514 Improved JavaClassReader to read InnerClasses and MissingTypes attributes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2841
diff changeset
  1203
    attributes add: #MissingTypes; add: missingTypes.
d92f88db7514 Improved JavaClassReader to read InnerClasses and MissingTypes attributes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2841
diff changeset
  1204
d92f88db7514 Improved JavaClassReader to read InnerClasses and MissingTypes attributes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2841
diff changeset
  1205
    "Created: / 16-10-2013 / 02:04:33 / Jan Vrany <jan.vrany@fit.cvut.cz>"
d92f88db7514 Improved JavaClassReader to read InnerClasses and MissingTypes attributes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2841
diff changeset
  1206
!
d92f88db7514 Improved JavaClassReader to read InnerClasses and MissingTypes attributes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2841
diff changeset
  1207
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  1208
readRuntimeAnnotationsAttributeFor: something visible: visible
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1209
    | length  annotationsCount  annotations  rawAnnotations  startPos  endPos |
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1210
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1211
    self assert: inStream isPositionable
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1212
        message: '.class file stream must be positionable'.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1213
    length := inStream nextUnsignedLongMSB: msb.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1214
    startPos := inStream position.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1215
    annotationsCount := inStream nextUnsignedShortMSB: msb.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1216
    annotationsCount = 0 ifTrue: [ ^ nil ].
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1217
    annotations := visible ifTrue: [something ensureHasAnnotations ensureRuntimeVisible] ifFalse: [something ensureHasAnnotations ensureRuntimeInvisible].
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  1218
    annotationsCount timesRepeat:
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1219
            [ | currentAnnotation |
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1220
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1221
            currentAnnotation := self readAnnotationFor: something.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1222
            annotations at: currentAnnotation name put: currentAnnotation. ].
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1223
     "Cut raw annotations as required by getRawAnnotations()"
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1224
    endPos := inStream position.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1225
    inStream position: startPos.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1226
    rawAnnotations := inStream next: length.
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  1227
    inStream position ~= endPos
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1228
        ifTrue: [ self halt: 'annotations are probably reading what they shouldnt' ].
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1229
    annotations rawAnnotations: rawAnnotations.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1230
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1231
    "Modified: / 07-01-2011 / 22:00:07 / Jan Kurs <kurs.jan@post.cz>"
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1232
    "Modified: / 25-02-2011 / 18:45:58 / Marcel Hlopko <hlopik@gmail.com>"
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1233
    "Modified: / 03-03-2011 / 23:01:45 / Jan Vrany <jan.vrany@fit.cvut.cz>"
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1234
    "Modified: / 16-03-2011 / 16:57:03 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
2148
b51eb5830f48 added:11 methods
Claus Gittinger <cg@exept.de>
parents: 2142
diff changeset
  1235
!
b51eb5830f48 added:11 methods
Claus Gittinger <cg@exept.de>
parents: 2142
diff changeset
  1236
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  1237
readRuntimeParameterAnnotationsAttributeFor: javaMethod visible: visible
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  1238
    | length  paramsCount  annotationsCount  rawAnnotations  startPos  endPos |
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1239
    self assert: inStream isPositionable
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1240
        message: '.class file stream must be positionable'.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1241
    length := inStream nextUnsignedLongMSB: msb.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1242
    startPos := inStream position.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1243
    paramsCount := inStream nextByte.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1244
    paramsCount = 0 ifTrue: [ ^ nil ].
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  1245
    1 to: paramsCount do: [
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  1246
        :paramIndex |
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  1247
        annotationsCount := inStream nextUnsignedShortMSB: msb.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  1248
        annotationsCount > 0 ifTrue: [
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  1249
            | annotations |
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  1250
            annotations := visible ifTrue: [
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  1251
                    javaMethod ensureHasAnnotations
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  1252
                        ensureVisibleParameterAnnotationsAt: paramIndex
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  1253
                ] ifFalse: [
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  1254
                    javaMethod ensureHasAnnotations
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  1255
                        ensureInvisibleParameterAnnotationsAt: paramIndex
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  1256
                ].
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  1257
            annotationsCount timesRepeat: [
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  1258
                | annotation |
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  1259
                annotation := self readAnnotationFor: javaMethod.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  1260
                annotations at: (annotation name) put: annotation.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  1261
            ]
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  1262
        ]
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  1263
    ].
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1264
    endPos := inStream position.
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  1265
    inStream position: startPos.
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1266
    rawAnnotations := inStream next: length.
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  1267
    inStream position ~= endPos ifTrue: [
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  1268
        self halt: 'annotations are probably reading what they shouldnt'
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  1269
    ].
3003
c9f0019485ff get rid of old mh breakpoint
Marcel Hlopko <marcel.hlopko@gmail.com>
parents: 2966
diff changeset
  1270
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  1271
    javaMethod annotations rawParamAnnotations: rawAnnotations.
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1272
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1273
    "Modified: / 28-02-2011 / 17:05:47 / Marcel Hlopko <hlopik@gmail.com>"
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  1274
    "Modified: / 01-12-2012 / 22:54:35 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
3003
c9f0019485ff get rid of old mh breakpoint
Marcel Hlopko <marcel.hlopko@gmail.com>
parents: 2966
diff changeset
  1275
    "Modified: / 25-01-2014 / 21:44:28 / Marcel Hlopko <marcel.hlopko@fit.cvut.cz>"
2148
b51eb5830f48 added:11 methods
Claus Gittinger <cg@exept.de>
parents: 2142
diff changeset
  1276
!
b51eb5830f48 added:11 methods
Claus Gittinger <cg@exept.de>
parents: 2142
diff changeset
  1277
b51eb5830f48 added:11 methods
Claus Gittinger <cg@exept.de>
parents: 2142
diff changeset
  1278
readSignatureAttributeFor:something
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1279
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1280
    |attribute_length signature_index signature|
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1281
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1282
    attribute_length := inStream nextUnsignedLongMSB:msb.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1283
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1284
    signature_index := inStream nextUnsignedShortMSB:msb.
3291
2cf782f380f2 JavaClass memory optimization (part 2)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3290
diff changeset
  1285
    signature := self constantPoolAt:signature_index.
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1286
3293
14292924cac7 JavaClass memory optimization (part 4)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3291
diff changeset
  1287
    something isJavaClass ifTrue:[
14292924cac7 JavaClass memory optimization (part 4)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3291
diff changeset
  1288
        attributes add: #GenericSignature; add: signature
14292924cac7 JavaClass memory optimization (part 4)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3291
diff changeset
  1289
    ] ifFalse:[
14292924cac7 JavaClass memory optimization (part 4)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3291
diff changeset
  1290
        something setSignature: signature.
14292924cac7 JavaClass memory optimization (part 4)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3291
diff changeset
  1291
    ].
14292924cac7 JavaClass memory optimization (part 4)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3291
diff changeset
  1292
14292924cac7 JavaClass memory optimization (part 4)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3291
diff changeset
  1293
    "Modified: / 07-12-2014 / 01:43:06 / Jan Vrany <jan.vrany@fit.cvut.cz>"
2148
b51eb5830f48 added:11 methods
Claus Gittinger <cg@exept.de>
parents: 2142
diff changeset
  1294
!
b51eb5830f48 added:11 methods
Claus Gittinger <cg@exept.de>
parents: 2142
diff changeset
  1295
b51eb5830f48 added:11 methods
Claus Gittinger <cg@exept.de>
parents: 2142
diff changeset
  1296
readSourceDebugExtensionAttributeFor:something
b51eb5830f48 added:11 methods
Claus Gittinger <cg@exept.de>
parents: 2142
diff changeset
  1297
"/        ('JAVA [info]: unhandled attribute: SourceDebugExtension') infoPrintCR.
b51eb5830f48 added:11 methods
Claus Gittinger <cg@exept.de>
parents: 2142
diff changeset
  1298
        self skipAttribute:'SourceDebugExtension'.
b51eb5830f48 added:11 methods
Claus Gittinger <cg@exept.de>
parents: 2142
diff changeset
  1299
!
b51eb5830f48 added:11 methods
Claus Gittinger <cg@exept.de>
parents: 2142
diff changeset
  1300
353
666b33cfc98f *** empty log message ***
cg
parents: 352
diff changeset
  1301
readSourceFileAttributeFor:aClass
350
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1302
    |attribute_length sourceFile_index sourceFile|
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1303
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1304
    attribute_length := inStream nextUnsignedLongMSB:msb.
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1305
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1306
    sourceFile_index := inStream nextUnsignedShortMSB:msb.
3291
2cf782f380f2 JavaClass memory optimization (part 2)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3290
diff changeset
  1307
    sourceFile := self constantPoolAt:sourceFile_index.
350
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1308
353
666b33cfc98f *** empty log message ***
cg
parents: 352
diff changeset
  1309
    aClass isJavaClass ifTrue:[
666b33cfc98f *** empty log message ***
cg
parents: 352
diff changeset
  1310
        aClass setSourceFile:sourceFile.
666b33cfc98f *** empty log message ***
cg
parents: 352
diff changeset
  1311
    ] ifFalse:[
666b33cfc98f *** empty log message ***
cg
parents: 352
diff changeset
  1312
        aClass setClassFilename:sourceFile
666b33cfc98f *** empty log message ***
cg
parents: 352
diff changeset
  1313
    ].
350
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1314
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1315
    Verbose ifTrue:[Transcript show:'sourceFile: '; showCR:sourceFile].
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1316
    ^ true
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1317
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1318
    "
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1319
     JavaClassReader loadFile:'/phys/ibm3/hotjava/classes/browser/AddButton.class'
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1320
     JavaClassReader loadFile:'/phys/ibm3/hotjava/classes/browser/Alignable.class'
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1321
     JavaClassReader loadFile:'foo.cls'
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1322
    "
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1323
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1324
    "Created: / 15.4.1996 / 15:40:17 / cg"
353
666b33cfc98f *** empty log message ***
cg
parents: 352
diff changeset
  1325
    "Modified: / 12.5.1998 / 22:01:07 / cg"
350
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1326
!
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1327
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  1328
readStackMapTableAttributeFor:something
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1329
"/        ('JAVA [info]: unhandled attribute: StackMapTable') infoPrintCR.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1330
    self skipAttribute:'StackMapTable'.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1331
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1332
    "Created: / 09-02-2011 / 01:19:20 / Marcel Hlopko <hlopik@gmail.com>"
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1333
!
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1334
2148
b51eb5830f48 added:11 methods
Claus Gittinger <cg@exept.de>
parents: 2142
diff changeset
  1335
readSyntheticAttributeFor:something
b51eb5830f48 added:11 methods
Claus Gittinger <cg@exept.de>
parents: 2142
diff changeset
  1336
"/        ('JAVA [info]: unhandled attribute: Synthetic') infoPrintCR.
b51eb5830f48 added:11 methods
Claus Gittinger <cg@exept.de>
parents: 2142
diff changeset
  1337
        self skipAttribute:'Synthetic'.
2729
ac412f6ea6d4 More support for method's source display. Not yet working.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2591
diff changeset
  1338
        attributes add: #Synthetic; add: true.
ac412f6ea6d4 More support for method's source display. Not yet working.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2591
diff changeset
  1339
ac412f6ea6d4 More support for method's source display. Not yet working.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2591
diff changeset
  1340
    "Modified: / 13-09-2013 / 01:08:54 / Jan Vrany <jan.vrany@fit.cvut.cz>"
2148
b51eb5830f48 added:11 methods
Claus Gittinger <cg@exept.de>
parents: 2142
diff changeset
  1341
!
b51eb5830f48 added:11 methods
Claus Gittinger <cg@exept.de>
parents: 2142
diff changeset
  1342
3289
3aaf43a51816 Extracted magic and version detection into separate methods
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3288
diff changeset
  1343
skipAttribute
3aaf43a51816 Extracted magic and version detection into separate methods
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3288
diff changeset
  1344
    "Skip attribute, advance in .class file stream to next entity"
3aaf43a51816 Extracted magic and version detection into separate methods
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3288
diff changeset
  1345
    inStream skip: self readAttributeLength.
3aaf43a51816 Extracted magic and version detection into separate methods
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3288
diff changeset
  1346
3aaf43a51816 Extracted magic and version detection into separate methods
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3288
diff changeset
  1347
    "Created: / 06-12-2014 / 10:53:54 / Jan Vrany <jan.vrany@fit.cvut.cz>"
3aaf43a51816 Extracted magic and version detection into separate methods
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3288
diff changeset
  1348
!
3aaf43a51816 Extracted magic and version detection into separate methods
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3288
diff changeset
  1349
333
1622ff2b686b checkin from browser
cg
parents: 330
diff changeset
  1350
skipAttribute:attributeName
1622ff2b686b checkin from browser
cg
parents: 330
diff changeset
  1351
    "dont know about this attribute - skip it here"
1622ff2b686b checkin from browser
cg
parents: 330
diff changeset
  1352
1622ff2b686b checkin from browser
cg
parents: 330
diff changeset
  1353
    Verbose ifTrue:[Transcript show:'skipped '; show:attributeName; showCR:'-attribute'].
3289
3aaf43a51816 Extracted magic and version detection into separate methods
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3288
diff changeset
  1354
    self skipAttribute
333
1622ff2b686b checkin from browser
cg
parents: 330
diff changeset
  1355
2866
d92f88db7514 Improved JavaClassReader to read InnerClasses and MissingTypes attributes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2841
diff changeset
  1356
    "Created: / 09-04-1998 / 18:12:46 / cg"
3289
3aaf43a51816 Extracted magic and version detection into separate methods
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3288
diff changeset
  1357
    "Modified: / 06-12-2014 / 10:54:11 / Jan Vrany <jan.vrany@fit.cvut.cz>"
3290
76d4443744ed JavaClass memory optimization (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3289
diff changeset
  1358
!
76d4443744ed JavaClass memory optimization (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3289
diff changeset
  1359
76d4443744ed JavaClass memory optimization (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3289
diff changeset
  1360
skipAttributeLength
76d4443744ed JavaClass memory optimization (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3289
diff changeset
  1361
    inStream skip:4.
76d4443744ed JavaClass memory optimization (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3289
diff changeset
  1362
76d4443744ed JavaClass memory optimization (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3289
diff changeset
  1363
    "Created: / 03-12-2014 / 12:53:38 / Jan Vrany <jan.vrany@fit.cvut.cz>"
5
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
  1364
! !
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
  1365
350
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1366
!JavaClassReader methodsFor:'file reading - attributes-ST'!
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1367
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1368
readSTClassCategoryAttributeFor:aClass
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1369
    |attribute_length categoryString_index categoryString|
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1370
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1371
    attribute_length := inStream nextUnsignedLongMSB:msb.
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1372
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1373
    categoryString_index := inStream nextUnsignedShortMSB:msb.
3291
2cf782f380f2 JavaClass memory optimization (part 2)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3290
diff changeset
  1374
    categoryString := self constantPoolAt:categoryString_index.
350
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1375
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1376
    aClass category:categoryString.
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1377
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1378
    Verbose ifTrue:[Transcript show:'categoryString: '; showCR:categoryString].
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1379
    ^ true
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1380
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1381
    "
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1382
     JavaClassReader loadFile:'foo.cls'
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1383
    "
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1384
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1385
    "Created: / 9.5.1998 / 02:33:13 / cg"
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1386
    "Modified: / 9.5.1998 / 02:36:55 / cg"
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1387
!
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1388
353
666b33cfc98f *** empty log message ***
cg
parents: 352
diff changeset
  1389
readSTClassInstVarNamesAttributeFor:aClass
666b33cfc98f *** empty log message ***
cg
parents: 352
diff changeset
  1390
    |attribute_length nameString_index nameString|
666b33cfc98f *** empty log message ***
cg
parents: 352
diff changeset
  1391
666b33cfc98f *** empty log message ***
cg
parents: 352
diff changeset
  1392
    attribute_length := inStream nextUnsignedLongMSB:msb.
666b33cfc98f *** empty log message ***
cg
parents: 352
diff changeset
  1393
666b33cfc98f *** empty log message ***
cg
parents: 352
diff changeset
  1394
    nameString_index := inStream nextUnsignedShortMSB:msb.
3291
2cf782f380f2 JavaClass memory optimization (part 2)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3290
diff changeset
  1395
    nameString := self constantPoolAt:nameString_index.
353
666b33cfc98f *** empty log message ***
cg
parents: 352
diff changeset
  1396
666b33cfc98f *** empty log message ***
cg
parents: 352
diff changeset
  1397
    aClass class instanceVariableString:nameString.
666b33cfc98f *** empty log message ***
cg
parents: 352
diff changeset
  1398
666b33cfc98f *** empty log message ***
cg
parents: 352
diff changeset
  1399
    Verbose ifTrue:[Transcript show:'nameString: '; showCR:nameString].
666b33cfc98f *** empty log message ***
cg
parents: 352
diff changeset
  1400
    ^ true
666b33cfc98f *** empty log message ***
cg
parents: 352
diff changeset
  1401
666b33cfc98f *** empty log message ***
cg
parents: 352
diff changeset
  1402
    "
666b33cfc98f *** empty log message ***
cg
parents: 352
diff changeset
  1403
     JavaClassReader loadFile:'foo.cls'
666b33cfc98f *** empty log message ***
cg
parents: 352
diff changeset
  1404
    "
666b33cfc98f *** empty log message ***
cg
parents: 352
diff changeset
  1405
666b33cfc98f *** empty log message ***
cg
parents: 352
diff changeset
  1406
    "Modified: / 12.5.1998 / 22:18:03 / cg"
666b33cfc98f *** empty log message ***
cg
parents: 352
diff changeset
  1407
    "Created: / 12.5.1998 / 22:18:24 / cg"
666b33cfc98f *** empty log message ***
cg
parents: 352
diff changeset
  1408
!
666b33cfc98f *** empty log message ***
cg
parents: 352
diff changeset
  1409
350
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1410
readSTClassPackageAttributeFor:aClass
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1411
    |attribute_length packageString_index packageString|
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1412
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1413
    attribute_length := inStream nextUnsignedLongMSB:msb.
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1414
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1415
    packageString_index := inStream nextUnsignedShortMSB:msb.
3291
2cf782f380f2 JavaClass memory optimization (part 2)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3290
diff changeset
  1416
    packageString := self constantPoolAt:packageString_index.
350
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1417
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1418
    aClass package:packageString asSymbol.
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1419
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1420
    Verbose ifTrue:[Transcript show:'packageString: '; showCR:packageString].
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1421
    ^ true
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1422
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1423
    "
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1424
     JavaClassReader loadFile:'foo.cls'
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1425
    "
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1426
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1427
    "Modified: / 9.5.1998 / 02:32:38 / cg"
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1428
    "Created: / 9.5.1998 / 02:33:44 / cg"
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1429
!
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1430
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1431
readSTClassRevisionAttributeFor:aClass
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1432
    |attribute_length revisionString_index revisionString|
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1433
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1434
    attribute_length := inStream nextUnsignedLongMSB:msb.
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1435
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1436
    revisionString_index := inStream nextUnsignedShortMSB:msb.
3291
2cf782f380f2 JavaClass memory optimization (part 2)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3290
diff changeset
  1437
    revisionString := self constantPoolAt:revisionString_index.
350
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1438
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1439
    aClass setBinaryRevision:revisionString.
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1440
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1441
    Verbose ifTrue:[Transcript show:'revisionString: '; showCR:revisionString].
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1442
    ^ true
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1443
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1444
    "
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1445
     JavaClassReader loadFile:'foo.cls'
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1446
    "
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1447
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1448
    "Created: / 9.5.1998 / 02:33:13 / cg"
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1449
    "Modified: / 9.5.1998 / 02:35:01 / cg"
353
666b33cfc98f *** empty log message ***
cg
parents: 352
diff changeset
  1450
!
666b33cfc98f *** empty log message ***
cg
parents: 352
diff changeset
  1451
666b33cfc98f *** empty log message ***
cg
parents: 352
diff changeset
  1452
readSTClassVarNamesAttributeFor:aClass
666b33cfc98f *** empty log message ***
cg
parents: 352
diff changeset
  1453
    |attribute_length nameString_index nameString|
666b33cfc98f *** empty log message ***
cg
parents: 352
diff changeset
  1454
666b33cfc98f *** empty log message ***
cg
parents: 352
diff changeset
  1455
    attribute_length := inStream nextUnsignedLongMSB:msb.
666b33cfc98f *** empty log message ***
cg
parents: 352
diff changeset
  1456
666b33cfc98f *** empty log message ***
cg
parents: 352
diff changeset
  1457
    nameString_index := inStream nextUnsignedShortMSB:msb.
3291
2cf782f380f2 JavaClass memory optimization (part 2)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3290
diff changeset
  1458
    nameString := self constantPoolAt:nameString_index.
353
666b33cfc98f *** empty log message ***
cg
parents: 352
diff changeset
  1459
666b33cfc98f *** empty log message ***
cg
parents: 352
diff changeset
  1460
    aClass classVariableString:nameString.
666b33cfc98f *** empty log message ***
cg
parents: 352
diff changeset
  1461
666b33cfc98f *** empty log message ***
cg
parents: 352
diff changeset
  1462
    Verbose ifTrue:[Transcript show:'nameString: '; showCR:nameString].
666b33cfc98f *** empty log message ***
cg
parents: 352
diff changeset
  1463
    ^ true
666b33cfc98f *** empty log message ***
cg
parents: 352
diff changeset
  1464
666b33cfc98f *** empty log message ***
cg
parents: 352
diff changeset
  1465
    "
666b33cfc98f *** empty log message ***
cg
parents: 352
diff changeset
  1466
     JavaClassReader loadFile:'foo.cls'
666b33cfc98f *** empty log message ***
cg
parents: 352
diff changeset
  1467
    "
666b33cfc98f *** empty log message ***
cg
parents: 352
diff changeset
  1468
666b33cfc98f *** empty log message ***
cg
parents: 352
diff changeset
  1469
    "Created: / 9.5.1998 / 02:33:13 / cg"
666b33cfc98f *** empty log message ***
cg
parents: 352
diff changeset
  1470
    "Modified: / 12.5.1998 / 22:18:03 / cg"
666b33cfc98f *** empty log message ***
cg
parents: 352
diff changeset
  1471
!
666b33cfc98f *** empty log message ***
cg
parents: 352
diff changeset
  1472
666b33cfc98f *** empty log message ***
cg
parents: 352
diff changeset
  1473
readSTInstVarNamesAttributeFor:aClass
666b33cfc98f *** empty log message ***
cg
parents: 352
diff changeset
  1474
    |attribute_length nameString_index nameString|
666b33cfc98f *** empty log message ***
cg
parents: 352
diff changeset
  1475
666b33cfc98f *** empty log message ***
cg
parents: 352
diff changeset
  1476
    attribute_length := inStream nextUnsignedLongMSB:msb.
666b33cfc98f *** empty log message ***
cg
parents: 352
diff changeset
  1477
666b33cfc98f *** empty log message ***
cg
parents: 352
diff changeset
  1478
    nameString_index := inStream nextUnsignedShortMSB:msb.
3291
2cf782f380f2 JavaClass memory optimization (part 2)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3290
diff changeset
  1479
    nameString := self constantPoolAt:nameString_index.
353
666b33cfc98f *** empty log message ***
cg
parents: 352
diff changeset
  1480
666b33cfc98f *** empty log message ***
cg
parents: 352
diff changeset
  1481
    aClass setInstanceVariableString:nameString.
666b33cfc98f *** empty log message ***
cg
parents: 352
diff changeset
  1482
666b33cfc98f *** empty log message ***
cg
parents: 352
diff changeset
  1483
    Verbose ifTrue:[Transcript show:'nameString: '; showCR:nameString].
666b33cfc98f *** empty log message ***
cg
parents: 352
diff changeset
  1484
    ^ true
666b33cfc98f *** empty log message ***
cg
parents: 352
diff changeset
  1485
666b33cfc98f *** empty log message ***
cg
parents: 352
diff changeset
  1486
    "
666b33cfc98f *** empty log message ***
cg
parents: 352
diff changeset
  1487
     JavaClassReader loadFile:'foo.cls'
666b33cfc98f *** empty log message ***
cg
parents: 352
diff changeset
  1488
    "
666b33cfc98f *** empty log message ***
cg
parents: 352
diff changeset
  1489
666b33cfc98f *** empty log message ***
cg
parents: 352
diff changeset
  1490
    "Created: / 12.5.1998 / 22:18:14 / cg"
666b33cfc98f *** empty log message ***
cg
parents: 352
diff changeset
  1491
    "Modified: / 12.5.1998 / 22:21:10 / cg"
350
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1492
! !
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1493
5
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
  1494
!JavaClassReader methodsFor:'file reading - constants'!
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
  1495
1
083530508d9c intitial checkin
cg
parents:
diff changeset
  1496
readConstant
3106
e53888146940 Added support for new constants used bu JSR 272 Invoke dynamic.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3003
diff changeset
  1497
    |tag constReader|
1
083530508d9c intitial checkin
cg
parents:
diff changeset
  1498
083530508d9c intitial checkin
cg
parents:
diff changeset
  1499
11
30997f6943a4 checkin from browser
cg
parents: 9
diff changeset
  1500
    constNeeds2Slots := false.
30997f6943a4 checkin from browser
cg
parents: 9
diff changeset
  1501
1
083530508d9c intitial checkin
cg
parents:
diff changeset
  1502
    "/
083530508d9c intitial checkin
cg
parents:
diff changeset
  1503
    "/ get tag
083530508d9c intitial checkin
cg
parents:
diff changeset
  1504
    "/
128
acc4e8e77092 *** empty log message ***
cg
parents: 122
diff changeset
  1505
    tag := inStream nextByte.
61
ff1579eb825f showCr: -> showCR:
cg
parents: 60
diff changeset
  1506
    Verbose ifTrue:[Transcript show:'tag = '; showCR:tag].
1
083530508d9c intitial checkin
cg
parents:
diff changeset
  1507
350
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1508
    tag >= 250 ifTrue:[
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1509
        constReader := #(
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1510
                        "/ ST types
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1511
                        readConstant_ST_Large           "/ 249
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1512
                        readConstant_ST_Special         "/ 250
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1513
                        readConstant_ST_Character       "/ 251
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1514
                        readConstant_ST_ByteArray       "/ 252
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1515
                        readConstant_ST_Array           "/ 253
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1516
                        readConstant_ST_Symbol          "/ 254
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1517
                        readConstant_ST_Reserved        "/ 255
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1518
                    ) at:tag-249+1.
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1519
    ] ifFalse:[
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1520
        constReader := #(
344
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  1521
                        "/ JAVA types
695
fd5acdd14995 utf8 string decoding
cg
parents: 667
diff changeset
  1522
                        readConstant_Utf8               "/ 1  - now called Utf8
344
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  1523
                        readConstant_Unicode            "/ 2
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  1524
                        readConstant_Integer            "/ 3
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  1525
                        readConstant_Float              "/ 4
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  1526
                        readConstant_Long               "/ 5
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  1527
                        readConstant_Double             "/ 6
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  1528
                        readConstant_Class              "/ 7
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  1529
                        readConstant_String             "/ 8
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  1530
                        readConstant_Fieldref           "/ 9
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  1531
                        readConstant_Methodref          "/ 10
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  1532
                        readConstant_InterfaceMethodref "/ 11
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  1533
                        readConstant_NameAndType        "/ 12
3106
e53888146940 Added support for new constants used bu JSR 272 Invoke dynamic.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3003
diff changeset
  1534
                        readConstant_Undef              "/ 13
e53888146940 Added support for new constants used bu JSR 272 Invoke dynamic.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3003
diff changeset
  1535
                        readConstant_Undef              "/ 14
e53888146940 Added support for new constants used bu JSR 272 Invoke dynamic.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3003
diff changeset
  1536
                        readConstant_MethodHandle       "/ 15
e53888146940 Added support for new constants used bu JSR 272 Invoke dynamic.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3003
diff changeset
  1537
                        readConstant_MethodType         "/ 16
e53888146940 Added support for new constants used bu JSR 272 Invoke dynamic.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3003
diff changeset
  1538
                        readConstant_Undef              "/ 17
e53888146940 Added support for new constants used bu JSR 272 Invoke dynamic.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3003
diff changeset
  1539
                        readConstant_InvokeDynamic      "/ 18
344
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  1540
                    ) at:tag ifAbsent:[#readConstant_Undef].
350
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1541
    ].
1
083530508d9c intitial checkin
cg
parents:
diff changeset
  1542
    ^ self perform:constReader.
083530508d9c intitial checkin
cg
parents:
diff changeset
  1543
083530508d9c intitial checkin
cg
parents:
diff changeset
  1544
    "
083530508d9c intitial checkin
cg
parents:
diff changeset
  1545
     JavaClassReader readFile:'/phys/ibm3/hotjava/classes/browser/AddButton.class'
083530508d9c intitial checkin
cg
parents:
diff changeset
  1546
    "
083530508d9c intitial checkin
cg
parents:
diff changeset
  1547
3106
e53888146940 Added support for new constants used bu JSR 272 Invoke dynamic.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3003
diff changeset
  1548
    "Created: / 15-04-1996 / 15:46:32 / cg"
e53888146940 Added support for new constants used bu JSR 272 Invoke dynamic.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3003
diff changeset
  1549
    "Modified: / 09-05-1998 / 01:26:05 / cg"
e53888146940 Added support for new constants used bu JSR 272 Invoke dynamic.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3003
diff changeset
  1550
    "Modified: / 20-05-2014 / 17:15:04 / Jan Vrany <jan.vrany@fit.cvut.cz>"
1
083530508d9c intitial checkin
cg
parents:
diff changeset
  1551
!
083530508d9c intitial checkin
cg
parents:
diff changeset
  1552
083530508d9c intitial checkin
cg
parents:
diff changeset
  1553
readConstantPool
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1554
    | constantPoolSize  const |
1
083530508d9c intitial checkin
cg
parents:
diff changeset
  1555
083530508d9c intitial checkin
cg
parents:
diff changeset
  1556
    "/
083530508d9c intitial checkin
cg
parents:
diff changeset
  1557
    "/ get constant pool
083530508d9c intitial checkin
cg
parents:
diff changeset
  1558
    "/
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1559
    constantPoolSize := inStream nextUnsignedShortMSB: msb.
3290
76d4443744ed JavaClass memory optimization (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3289
diff changeset
  1560
    Verbose ifTrue:[
3195
0b6a9ff08acd Class reading optimization [1/4]: optimize CharacterArray class>>decodeFromJavaUTF8:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3110
diff changeset
  1561
        self info: 'constantPoolSize = ' , constantPoolSize printString.
0b6a9ff08acd Class reading optimization [1/4]: optimize CharacterArray class>>decodeFromJavaUTF8:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3110
diff changeset
  1562
    ].
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1563
    constants := JavaConstantPool new: constantPoolSize - 1.
21
b9dd73f299dd checkin from browser
cg
parents: 14
diff changeset
  1564
    constSlot := 1.
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1565
    [ constSlot < constantPoolSize ] whileTrue: [
3290
76d4443744ed JavaClass memory optimization (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3289
diff changeset
  1566
            Verbose ifTrue:[
3195
0b6a9ff08acd Class reading optimization [1/4]: optimize CharacterArray class>>decodeFromJavaUTF8:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3110
diff changeset
  1567
                self info: 'const slot: ' , constSlot printString.
0b6a9ff08acd Class reading optimization [1/4]: optimize CharacterArray class>>decodeFromJavaUTF8:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3110
diff changeset
  1568
            ].
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1569
            const := self readConstant.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1570
            constants at: constSlot put: const.
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  1571
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1572
            "/ long & double consts take 2 slots
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1573
            "/ (only first is used)
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  1574
3195
0b6a9ff08acd Class reading optimization [1/4]: optimize CharacterArray class>>decodeFromJavaUTF8:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3110
diff changeset
  1575
            constSlot := constNeeds2Slots ifTrue: [ constSlot + 2. ] ifFalse: [ constSlot + 1. ]].
52
1dc41619b6f8 checkin from browser
cg
parents: 50
diff changeset
  1576
    constSlot := -1.
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  1577
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  1578
    constants do:[:ref|ref isJavaRef ifTrue:[ref preResolve]].
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  1579
"/    1 to: constantPoolSize - 1
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  1580
"/        do:
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  1581
"/            [:i |
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  1582
"/            | const  value |
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  1583
"/
3291
2cf782f380f2 JavaClass memory optimization (part 2)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3290
diff changeset
  1584
"/            const := self constantPoolAt: i.
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  1585
"/            const notNil ifTrue:
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  1586
"/                    [ "/ kludge for 2-slot constants (which only take 1 slot in ST/X)
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  1587
"/                    (const isKindOf: JavaUnresolvedConstant)
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  1588
"/                        ifTrue:
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  1589
"/                            [ value := const preResolve.
3291
2cf782f380f2 JavaClass memory optimization (part 2)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3290
diff changeset
  1590
"/                            value ~~ const ifTrue: [ self constantPoolAt: i put: value. ] ] ] ].
1
083530508d9c intitial checkin
cg
parents:
diff changeset
  1591
083530508d9c intitial checkin
cg
parents:
diff changeset
  1592
    "
083530508d9c intitial checkin
cg
parents:
diff changeset
  1593
     JavaClassReader readFile:'/phys/ibm3/hotjava/classes/browser/AddButton.class'
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1594
     JavaClassReader readFile:'/phys/ibm3/hotjava/classes/browser/Alignable.class'"
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1595
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1596
    "Modified: / 07-05-1998 / 11:44:06 / cg"
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1597
    "Created: / 13-05-2011 / 16:52:54 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
3195
0b6a9ff08acd Class reading optimization [1/4]: optimize CharacterArray class>>decodeFromJavaUTF8:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3110
diff changeset
  1598
    "Modified: / 04-08-2014 / 15:41:37 / Jan Vrany <jan.vrany@fit.cvut.cz>"
1
083530508d9c intitial checkin
cg
parents:
diff changeset
  1599
!
083530508d9c intitial checkin
cg
parents:
diff changeset
  1600
083530508d9c intitial checkin
cg
parents:
diff changeset
  1601
readConstant_Asciz
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1602
    | len  string |
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1603
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1604
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1605
    len := inStream nextUnsignedShortMSB: msb.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1606
    string := String new: len.
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  1607
    inStream
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1608
        nextBytes: len
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1609
        into: string
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1610
        startingAt: 1.
3275
881799d310e3 Intern all constant pool strings.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3198
diff changeset
  1611
    string := InternedStrings elementAt: string ifAbsent: [ InternedStrings add: string ].
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  1612
    Verbose
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  1613
        ifTrue:
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1614
            [ Transcript
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1615
                show: 'asciz; string= ';
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1616
                showCR: string ].
1
083530508d9c intitial checkin
cg
parents:
diff changeset
  1617
    ^ string
083530508d9c intitial checkin
cg
parents:
diff changeset
  1618
083530508d9c intitial checkin
cg
parents:
diff changeset
  1619
    "
083530508d9c intitial checkin
cg
parents:
diff changeset
  1620
     JavaClassReader readFile:'/phys/ibm3/hotjava/classes/browser/AddButton.class'
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1621
     JavaClassReader readFile:'/phys/ibm3/hotjava/classes/browser/Alignable.class'"
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1622
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1623
    "Created: / 15-04-1996 / 15:15:35 / cg"
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1624
    "Modified: / 15-04-1996 / 16:33:45 / cg"
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1625
    "Modified: / 13-05-2011 / 17:31:39 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
3275
881799d310e3 Intern all constant pool strings.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3198
diff changeset
  1626
    "Modified: / 13-11-2014 / 11:53:55 / Jan Vrany <jan.vrany@fit.cvut.cz>"
1
083530508d9c intitial checkin
cg
parents:
diff changeset
  1627
!
083530508d9c intitial checkin
cg
parents:
diff changeset
  1628
083530508d9c intitial checkin
cg
parents:
diff changeset
  1629
readConstant_Class
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1630
    | nameIndex |
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1631
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1632
    nameIndex := inStream nextUnsignedShortMSB: msb.
3290
76d4443744ed JavaClass memory optimization (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3289
diff changeset
  1633
    Verbose ifTrue:[
3291
2cf782f380f2 JavaClass memory optimization (part 2)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3290
diff changeset
  1634
        ((self constantPoolAt: nameIndex) isNil) ifTrue: [
3195
0b6a9ff08acd Class reading optimization [1/4]: optimize CharacterArray class>>decodeFromJavaUTF8:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3110
diff changeset
  1635
                self info: ('reading class; index=' , nameIndex printString , ' name='
3291
2cf782f380f2 JavaClass memory optimization (part 2)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3290
diff changeset
  1636
                            , (self constantPoolAt: nameIndex) printString)
3290
76d4443744ed JavaClass memory optimization (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3289
diff changeset
  1637
        ] ifFalse: [
76d4443744ed JavaClass memory optimization (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3289
diff changeset
  1638
            self info: ('reading class; index= ' , nameIndex printString)
3195
0b6a9ff08acd Class reading optimization [1/4]: optimize CharacterArray class>>decodeFromJavaUTF8:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3110
diff changeset
  1639
        ].
0b6a9ff08acd Class reading optimization [1/4]: optimize CharacterArray class>>decodeFromJavaUTF8:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3110
diff changeset
  1640
    ].
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1641
    ^ JavaClassRef2 in: constants withNameAt: nameIndex.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1642
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1643
    "Modified: / 18-05-2011 / 18:21:16 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
3626
7be362f041a8 Issue #93 [2/3]: Avoid (expensive) test for compilation error at (re)compilation time
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3431
diff changeset
  1644
    "Modified: / 20-09-2016 / 22:34:32 / Jan Vrany <jan.vrany@fit.cvut.cz>"
1
083530508d9c intitial checkin
cg
parents:
diff changeset
  1645
!
083530508d9c intitial checkin
cg
parents:
diff changeset
  1646
11
30997f6943a4 checkin from browser
cg
parents: 9
diff changeset
  1647
readConstant_Double
350
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1648
    |high low aFloat bytes|
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1649
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1650
"/ new code - to be tested
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1651
"/    bytes := ByteArray new:8.
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1652
"/
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1653
"/    inStream nextBytes:8 into:bytes startingAt:1.
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1654
"/    msb ~~ UninterpretedBytes isBigEndian ifTrue:[
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1655
"/        bytes reverse
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1656
"/    ].
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1657
"/    aFloat := bytes doubleAt:1.
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1658
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1659
"/ old code
11
30997f6943a4 checkin from browser
cg
parents: 9
diff changeset
  1660
128
acc4e8e77092 *** empty log message ***
cg
parents: 122
diff changeset
  1661
    high := inStream nextUnsignedLongMSB:msb.
acc4e8e77092 *** empty log message ***
cg
parents: 122
diff changeset
  1662
    low := inStream nextUnsignedLongMSB:msb.
11
30997f6943a4 checkin from browser
cg
parents: 9
diff changeset
  1663
30997f6943a4 checkin from browser
cg
parents: 9
diff changeset
  1664
    aFloat := Float new.
30997f6943a4 checkin from browser
cg
parents: 9
diff changeset
  1665
    UninterpretedBytes isBigEndian ifTrue:[
350
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1666
        aFloat basicAt:1 put:((high bitShift:-24) bitAnd:16rFF).
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1667
        aFloat basicAt:2 put:((high bitShift:-16) bitAnd:16rFF).
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1668
        aFloat basicAt:3 put:((high bitShift:-8) bitAnd:16rFF).
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1669
        aFloat basicAt:4 put:(high bitAnd:16rFF).
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1670
        aFloat basicAt:5 put:((low bitShift:-24) bitAnd:16rFF).
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1671
        aFloat basicAt:6 put:((low bitShift:-16) bitAnd:16rFF).
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1672
        aFloat basicAt:7 put:((low bitShift:-8) bitAnd:16rFF).
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1673
        aFloat basicAt:8 put:(low bitAnd:16rFF).
11
30997f6943a4 checkin from browser
cg
parents: 9
diff changeset
  1674
    ] ifFalse:[
350
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1675
        aFloat basicAt:1 put:(low bitAnd:16rFF).
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1676
        aFloat basicAt:2 put:((low bitShift:-8) bitAnd:16rFF).
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1677
        aFloat basicAt:3 put:((low bitShift:-16) bitAnd:16rFF).
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1678
        aFloat basicAt:4 put:((low bitShift:-24) bitAnd:16rFF).
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1679
        aFloat basicAt:5 put:(high bitAnd:16rFF).
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1680
        aFloat basicAt:6 put:((high bitShift:-8) bitAnd:16rFF).
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1681
        aFloat basicAt:7 put:((high bitShift:-16) bitAnd:16rFF).
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1682
        aFloat basicAt:8 put:((high bitShift:-24) bitAnd:16rFF).
11
30997f6943a4 checkin from browser
cg
parents: 9
diff changeset
  1683
    ].
30997f6943a4 checkin from browser
cg
parents: 9
diff changeset
  1684
30997f6943a4 checkin from browser
cg
parents: 9
diff changeset
  1685
    constNeeds2Slots := true.
30997f6943a4 checkin from browser
cg
parents: 9
diff changeset
  1686
61
ff1579eb825f showCr: -> showCR:
cg
parents: 60
diff changeset
  1687
    Verbose ifTrue:[Transcript show:'double; value= ';     showCR:aFloat].
11
30997f6943a4 checkin from browser
cg
parents: 9
diff changeset
  1688
    ^ aFloat
30997f6943a4 checkin from browser
cg
parents: 9
diff changeset
  1689
30997f6943a4 checkin from browser
cg
parents: 9
diff changeset
  1690
    "
30997f6943a4 checkin from browser
cg
parents: 9
diff changeset
  1691
     JavaClassReader readFile:'/phys/ibm3/hotjava/classes/browser/AddButton.class'
30997f6943a4 checkin from browser
cg
parents: 9
diff changeset
  1692
     JavaClassReader readFile:'/phys/ibm3/hotjava/classes/browser/Alignable.class'
30997f6943a4 checkin from browser
cg
parents: 9
diff changeset
  1693
    "
30997f6943a4 checkin from browser
cg
parents: 9
diff changeset
  1694
350
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1695
    "Created: / 15.4.1996 / 16:34:42 / cg"
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1696
    "Modified: / 8.5.1998 / 22:06:07 / cg"
11
30997f6943a4 checkin from browser
cg
parents: 9
diff changeset
  1697
!
30997f6943a4 checkin from browser
cg
parents: 9
diff changeset
  1698
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  1699
readConstant_Fieldref
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1700
    "incrementally changing resolving logic, fields will come later"
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1701
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1702
    | classIndex  nameAndTypeIndex |
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1703
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1704
    classIndex := inStream nextUnsignedShortMSB: msb.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1705
    nameAndTypeIndex := inStream nextUnsignedShortMSB: msb.
3195
0b6a9ff08acd Class reading optimization [1/4]: optimize CharacterArray class>>decodeFromJavaUTF8:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3110
diff changeset
  1706
    Verbose ifTrue:[
0b6a9ff08acd Class reading optimization [1/4]: optimize CharacterArray class>>decodeFromJavaUTF8:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3110
diff changeset
  1707
        self
0b6a9ff08acd Class reading optimization [1/4]: optimize CharacterArray class>>decodeFromJavaUTF8:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3110
diff changeset
  1708
            info: 'reading fieldref; classindex=' , classIndex printString
0b6a9ff08acd Class reading optimization [1/4]: optimize CharacterArray class>>decodeFromJavaUTF8:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3110
diff changeset
  1709
                    , ' nameAndTypeIndex=' , nameAndTypeIndex printString.
0b6a9ff08acd Class reading optimization [1/4]: optimize CharacterArray class>>decodeFromJavaUTF8:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3110
diff changeset
  1710
    ].
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  1711
    ^ JavaFieldRef2
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1712
        in: constants
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1713
        withNameAndTypeAt: nameAndTypeIndex
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1714
        andClassAt: classIndex.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1715
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1716
    "Modified: / 15-05-2011 / 14:20:23 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
3195
0b6a9ff08acd Class reading optimization [1/4]: optimize CharacterArray class>>decodeFromJavaUTF8:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3110
diff changeset
  1717
    "Modified: / 04-08-2014 / 15:38:58 / Jan Vrany <jan.vrany@fit.cvut.cz>"
1
083530508d9c intitial checkin
cg
parents:
diff changeset
  1718
!
083530508d9c intitial checkin
cg
parents:
diff changeset
  1719
11
30997f6943a4 checkin from browser
cg
parents: 9
diff changeset
  1720
readConstant_Float
433
d9d6841784f1 checkin from browser
cg
parents: 423
diff changeset
  1721
    |b1 b2 b3 b4 aFloat bytes|
350
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1722
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1723
"/ new code - to be tested ...
352
9093171ef0a6 oops - float reading
cg
parents: 350
diff changeset
  1724
"/
9093171ef0a6 oops - float reading
cg
parents: 350
diff changeset
  1725
"/    bytes := ByteArray new:4.
9093171ef0a6 oops - float reading
cg
parents: 350
diff changeset
  1726
"/    inStream nextBytes:4 into:bytes startingAt:1.
9093171ef0a6 oops - float reading
cg
parents: 350
diff changeset
  1727
"/    msb ~~ UninterpretedBytes isBigEndian ifTrue:[
9093171ef0a6 oops - float reading
cg
parents: 350
diff changeset
  1728
"/        bytes reverse
9093171ef0a6 oops - float reading
cg
parents: 350
diff changeset
  1729
"/    ].
9093171ef0a6 oops - float reading
cg
parents: 350
diff changeset
  1730
"/    aFloat := bytes floatAt:1.
9093171ef0a6 oops - float reading
cg
parents: 350
diff changeset
  1731
"/    Verbose ifTrue:[Transcript show:'float; value= ';     showCR:aFloat].
9093171ef0a6 oops - float reading
cg
parents: 350
diff changeset
  1732
"/    ^ aFloat.
350
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1733
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1734
"/ old code
11
30997f6943a4 checkin from browser
cg
parents: 9
diff changeset
  1735
30997f6943a4 checkin from browser
cg
parents: 9
diff changeset
  1736
    aFloat := ShortFloat basicNew.
433
d9d6841784f1 checkin from browser
cg
parents: 423
diff changeset
  1737
d9d6841784f1 checkin from browser
cg
parents: 423
diff changeset
  1738
    b1 := inStream nextByte.
d9d6841784f1 checkin from browser
cg
parents: 423
diff changeset
  1739
    b2 := inStream nextByte.
d9d6841784f1 checkin from browser
cg
parents: 423
diff changeset
  1740
    b3 := inStream nextByte.
d9d6841784f1 checkin from browser
cg
parents: 423
diff changeset
  1741
    b4 := inStream nextByte.
d9d6841784f1 checkin from browser
cg
parents: 423
diff changeset
  1742
11
30997f6943a4 checkin from browser
cg
parents: 9
diff changeset
  1743
    UninterpretedBytes isBigEndian ifTrue:[
433
d9d6841784f1 checkin from browser
cg
parents: 423
diff changeset
  1744
        aFloat basicAt:1 put:b1.
d9d6841784f1 checkin from browser
cg
parents: 423
diff changeset
  1745
        aFloat basicAt:2 put:b2.
d9d6841784f1 checkin from browser
cg
parents: 423
diff changeset
  1746
        aFloat basicAt:3 put:b3.
d9d6841784f1 checkin from browser
cg
parents: 423
diff changeset
  1747
        aFloat basicAt:4 put:b4.
11
30997f6943a4 checkin from browser
cg
parents: 9
diff changeset
  1748
    ] ifFalse:[
433
d9d6841784f1 checkin from browser
cg
parents: 423
diff changeset
  1749
        aFloat basicAt:4 put:b1.
d9d6841784f1 checkin from browser
cg
parents: 423
diff changeset
  1750
        aFloat basicAt:3 put:b2.
d9d6841784f1 checkin from browser
cg
parents: 423
diff changeset
  1751
        aFloat basicAt:2 put:b3.
d9d6841784f1 checkin from browser
cg
parents: 423
diff changeset
  1752
        aFloat basicAt:1 put:b4.
11
30997f6943a4 checkin from browser
cg
parents: 9
diff changeset
  1753
    ].
61
ff1579eb825f showCr: -> showCR:
cg
parents: 60
diff changeset
  1754
    Verbose ifTrue:[Transcript show:'float; value= ';     showCR:aFloat].
11
30997f6943a4 checkin from browser
cg
parents: 9
diff changeset
  1755
    ^ aFloat
30997f6943a4 checkin from browser
cg
parents: 9
diff changeset
  1756
30997f6943a4 checkin from browser
cg
parents: 9
diff changeset
  1757
    "
30997f6943a4 checkin from browser
cg
parents: 9
diff changeset
  1758
     JavaClassReader readFile:'/phys/ibm3/hotjava/classes/browser/AddButton.class'
30997f6943a4 checkin from browser
cg
parents: 9
diff changeset
  1759
     JavaClassReader readFile:'/phys/ibm3/hotjava/classes/browser/Alignable.class'
30997f6943a4 checkin from browser
cg
parents: 9
diff changeset
  1760
    "
30997f6943a4 checkin from browser
cg
parents: 9
diff changeset
  1761
350
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1762
    "Created: / 15.4.1996 / 16:34:42 / cg"
433
d9d6841784f1 checkin from browser
cg
parents: 423
diff changeset
  1763
    "Modified: / 10.11.1998 / 22:04:59 / cg"
11
30997f6943a4 checkin from browser
cg
parents: 9
diff changeset
  1764
!
30997f6943a4 checkin from browser
cg
parents: 9
diff changeset
  1765
1
083530508d9c intitial checkin
cg
parents:
diff changeset
  1766
readConstant_Integer
083530508d9c intitial checkin
cg
parents:
diff changeset
  1767
    |value|
083530508d9c intitial checkin
cg
parents:
diff changeset
  1768
128
acc4e8e77092 *** empty log message ***
cg
parents: 122
diff changeset
  1769
    value := inStream nextLongMSB:msb.
1
083530508d9c intitial checkin
cg
parents:
diff changeset
  1770
61
ff1579eb825f showCr: -> showCR:
cg
parents: 60
diff changeset
  1771
    Verbose ifTrue:[Transcript show:'integer; value= ';     showCR:value].
1
083530508d9c intitial checkin
cg
parents:
diff changeset
  1772
083530508d9c intitial checkin
cg
parents:
diff changeset
  1773
    ^ value
083530508d9c intitial checkin
cg
parents:
diff changeset
  1774
083530508d9c intitial checkin
cg
parents:
diff changeset
  1775
    "
083530508d9c intitial checkin
cg
parents:
diff changeset
  1776
     JavaClassReader readFile:'/phys/ibm3/hotjava/classes/browser/AddButton.class'
083530508d9c intitial checkin
cg
parents:
diff changeset
  1777
     JavaClassReader readFile:'/phys/ibm3/hotjava/classes/browser/Alignable.class'
083530508d9c intitial checkin
cg
parents:
diff changeset
  1778
    "
083530508d9c intitial checkin
cg
parents:
diff changeset
  1779
083530508d9c intitial checkin
cg
parents:
diff changeset
  1780
    "Modified: 15.4.1996 / 15:42:16 / cg"
083530508d9c intitial checkin
cg
parents:
diff changeset
  1781
    "Created: 15.4.1996 / 16:34:42 / cg"
083530508d9c intitial checkin
cg
parents:
diff changeset
  1782
!
083530508d9c intitial checkin
cg
parents:
diff changeset
  1783
14
c1d9f60eb650 can now load all java.class files (see JavaClassReader>>loadFile:)
cg
parents: 11
diff changeset
  1784
readConstant_InterfaceMethodref
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1785
    | classIndex  nameAndTypeIndex  |
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1786
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1787
    classIndex := inStream nextUnsignedShortMSB: msb.
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  1788
    nameAndTypeIndex := inStream nextUnsignedShortMSB: msb.
3195
0b6a9ff08acd Class reading optimization [1/4]: optimize CharacterArray class>>decodeFromJavaUTF8:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3110
diff changeset
  1789
    Verbose ifTrue:[
0b6a9ff08acd Class reading optimization [1/4]: optimize CharacterArray class>>decodeFromJavaUTF8:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3110
diff changeset
  1790
        self
0b6a9ff08acd Class reading optimization [1/4]: optimize CharacterArray class>>decodeFromJavaUTF8:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3110
diff changeset
  1791
            info: 'reading interface methodref; classindex=' , classIndex printString
0b6a9ff08acd Class reading optimization [1/4]: optimize CharacterArray class>>decodeFromJavaUTF8:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3110
diff changeset
  1792
                    , ' nameAndTypeIndex=' , nameAndTypeIndex printString.
0b6a9ff08acd Class reading optimization [1/4]: optimize CharacterArray class>>decodeFromJavaUTF8:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3110
diff changeset
  1793
    ].
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  1794
    ^ JavaInterfaceMethodRef2
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1795
        in: constants
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1796
        withNameAndTypeAt: nameAndTypeIndex
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1797
        andClassAt: classIndex.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1798
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1799
    "Modified: / 12-05-2011 / 18:57:47 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
3195
0b6a9ff08acd Class reading optimization [1/4]: optimize CharacterArray class>>decodeFromJavaUTF8:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3110
diff changeset
  1800
    "Modified: / 04-08-2014 / 15:38:39 / Jan Vrany <jan.vrany@fit.cvut.cz>"
14
c1d9f60eb650 can now load all java.class files (see JavaClassReader>>loadFile:)
cg
parents: 11
diff changeset
  1801
!
c1d9f60eb650 can now load all java.class files (see JavaClassReader>>loadFile:)
cg
parents: 11
diff changeset
  1802
3106
e53888146940 Added support for new constants used bu JSR 272 Invoke dynamic.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3003
diff changeset
  1803
readConstant_InvokeDynamic
e53888146940 Added support for new constants used bu JSR 272 Invoke dynamic.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3003
diff changeset
  1804
    | bootstrapMethodAttrIndex nameAndTypeIndex |
e53888146940 Added support for new constants used bu JSR 272 Invoke dynamic.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3003
diff changeset
  1805
e53888146940 Added support for new constants used bu JSR 272 Invoke dynamic.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3003
diff changeset
  1806
    bootstrapMethodAttrIndex := inStream nextUnsignedShortMSB: msb.
e53888146940 Added support for new constants used bu JSR 272 Invoke dynamic.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3003
diff changeset
  1807
    nameAndTypeIndex := inStream nextUnsignedShortMSB: msb.
e53888146940 Added support for new constants used bu JSR 272 Invoke dynamic.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3003
diff changeset
  1808
e53888146940 Added support for new constants used bu JSR 272 Invoke dynamic.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3003
diff changeset
  1809
    ^ JavaInvokeDynamic2
3290
76d4443744ed JavaClass memory optimization (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3289
diff changeset
  1810
        in: constants
3106
e53888146940 Added support for new constants used bu JSR 272 Invoke dynamic.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3003
diff changeset
  1811
        bootstrapMethodAttrIndex:bootstrapMethodAttrIndex
e53888146940 Added support for new constants used bu JSR 272 Invoke dynamic.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3003
diff changeset
  1812
        nameAndTypeIndex:nameAndTypeIndex
e53888146940 Added support for new constants used bu JSR 272 Invoke dynamic.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3003
diff changeset
  1813
e53888146940 Added support for new constants used bu JSR 272 Invoke dynamic.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3003
diff changeset
  1814
    "Created: / 20-05-2014 / 17:37:07 / Jan Vrany <jan.vrany@fit.cvut.cz>"
e53888146940 Added support for new constants used bu JSR 272 Invoke dynamic.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3003
diff changeset
  1815
!
e53888146940 Added support for new constants used bu JSR 272 Invoke dynamic.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3003
diff changeset
  1816
11
30997f6943a4 checkin from browser
cg
parents: 9
diff changeset
  1817
readConstant_Long
30997f6943a4 checkin from browser
cg
parents: 9
diff changeset
  1818
    |high low value|
30997f6943a4 checkin from browser
cg
parents: 9
diff changeset
  1819
128
acc4e8e77092 *** empty log message ***
cg
parents: 122
diff changeset
  1820
    high := inStream nextUnsignedLongMSB:msb.
acc4e8e77092 *** empty log message ***
cg
parents: 122
diff changeset
  1821
    low := inStream nextUnsignedLongMSB:msb.
11
30997f6943a4 checkin from browser
cg
parents: 9
diff changeset
  1822
30997f6943a4 checkin from browser
cg
parents: 9
diff changeset
  1823
    value := (high bitShift:32) bitOr:low.
60
a763b1780ec0 checkin from browser
cg
parents: 59
diff changeset
  1824
    (high bitTest:16r80000000) ifTrue:[
252
04b330744577 new javaVM stuff & back to pre-stefans changes
cg
parents: 229
diff changeset
  1825
	value := value - 16r10000000000000000.
60
a763b1780ec0 checkin from browser
cg
parents: 59
diff changeset
  1826
    ].
11
30997f6943a4 checkin from browser
cg
parents: 9
diff changeset
  1827
    constNeeds2Slots := true.
30997f6943a4 checkin from browser
cg
parents: 9
diff changeset
  1828
61
ff1579eb825f showCr: -> showCR:
cg
parents: 60
diff changeset
  1829
    Verbose ifTrue:[Transcript show:'long; value= ';     showCR:value].
11
30997f6943a4 checkin from browser
cg
parents: 9
diff changeset
  1830
    ^ value
30997f6943a4 checkin from browser
cg
parents: 9
diff changeset
  1831
30997f6943a4 checkin from browser
cg
parents: 9
diff changeset
  1832
    "
30997f6943a4 checkin from browser
cg
parents: 9
diff changeset
  1833
     JavaClassReader readFile:'/phys/ibm3/hotjava/classes/browser/AddButton.class'
30997f6943a4 checkin from browser
cg
parents: 9
diff changeset
  1834
     JavaClassReader readFile:'/phys/ibm3/hotjava/classes/browser/Alignable.class'
30997f6943a4 checkin from browser
cg
parents: 9
diff changeset
  1835
    "
30997f6943a4 checkin from browser
cg
parents: 9
diff changeset
  1836
30997f6943a4 checkin from browser
cg
parents: 9
diff changeset
  1837
    "Modified: 15.4.1996 / 15:42:16 / cg"
30997f6943a4 checkin from browser
cg
parents: 9
diff changeset
  1838
    "Created: 15.4.1996 / 16:34:42 / cg"
30997f6943a4 checkin from browser
cg
parents: 9
diff changeset
  1839
!
30997f6943a4 checkin from browser
cg
parents: 9
diff changeset
  1840
3106
e53888146940 Added support for new constants used bu JSR 272 Invoke dynamic.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3003
diff changeset
  1841
readConstant_MethodHandle
e53888146940 Added support for new constants used bu JSR 272 Invoke dynamic.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3003
diff changeset
  1842
    | reference_kind  reference_index |
e53888146940 Added support for new constants used bu JSR 272 Invoke dynamic.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3003
diff changeset
  1843
e53888146940 Added support for new constants used bu JSR 272 Invoke dynamic.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3003
diff changeset
  1844
    reference_kind := inStream next.
e53888146940 Added support for new constants used bu JSR 272 Invoke dynamic.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3003
diff changeset
  1845
    reference_index := inStream nextUnsignedShortMSB: msb.
e53888146940 Added support for new constants used bu JSR 272 Invoke dynamic.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3003
diff changeset
  1846
3290
76d4443744ed JavaClass memory optimization (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3289
diff changeset
  1847
    ^ JavaMethodHandle2
3106
e53888146940 Added support for new constants used bu JSR 272 Invoke dynamic.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3003
diff changeset
  1848
        in:constants
e53888146940 Added support for new constants used bu JSR 272 Invoke dynamic.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3003
diff changeset
  1849
        kind:reference_kind
e53888146940 Added support for new constants used bu JSR 272 Invoke dynamic.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3003
diff changeset
  1850
        index:reference_index
e53888146940 Added support for new constants used bu JSR 272 Invoke dynamic.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3003
diff changeset
  1851
e53888146940 Added support for new constants used bu JSR 272 Invoke dynamic.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3003
diff changeset
  1852
    "Created: / 20-05-2014 / 17:30:36 / Jan Vrany <jan.vrany@fit.cvut.cz>"
e53888146940 Added support for new constants used bu JSR 272 Invoke dynamic.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3003
diff changeset
  1853
!
e53888146940 Added support for new constants used bu JSR 272 Invoke dynamic.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3003
diff changeset
  1854
e53888146940 Added support for new constants used bu JSR 272 Invoke dynamic.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3003
diff changeset
  1855
readConstant_MethodType
e53888146940 Added support for new constants used bu JSR 272 Invoke dynamic.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3003
diff changeset
  1856
    | descriptorIndex |
e53888146940 Added support for new constants used bu JSR 272 Invoke dynamic.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3003
diff changeset
  1857
e53888146940 Added support for new constants used bu JSR 272 Invoke dynamic.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3003
diff changeset
  1858
    descriptorIndex := inStream nextUnsignedShortMSB: msb.
3290
76d4443744ed JavaClass memory optimization (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3289
diff changeset
  1859
    ^ JavaMethodType2
3106
e53888146940 Added support for new constants used bu JSR 272 Invoke dynamic.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3003
diff changeset
  1860
        in:constants
e53888146940 Added support for new constants used bu JSR 272 Invoke dynamic.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3003
diff changeset
  1861
        index:descriptorIndex
e53888146940 Added support for new constants used bu JSR 272 Invoke dynamic.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3003
diff changeset
  1862
e53888146940 Added support for new constants used bu JSR 272 Invoke dynamic.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3003
diff changeset
  1863
    "Created: / 20-05-2014 / 17:40:56 / Jan Vrany <jan.vrany@fit.cvut.cz>"
e53888146940 Added support for new constants used bu JSR 272 Invoke dynamic.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3003
diff changeset
  1864
!
e53888146940 Added support for new constants used bu JSR 272 Invoke dynamic.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3003
diff changeset
  1865
1
083530508d9c intitial checkin
cg
parents:
diff changeset
  1866
readConstant_Methodref
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1867
    | classIndex  nameAndTypeIndex   |
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1868
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1869
    classIndex := inStream nextUnsignedShortMSB: msb.
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  1870
    nameAndTypeIndex := inStream nextUnsignedShortMSB: msb.
3195
0b6a9ff08acd Class reading optimization [1/4]: optimize CharacterArray class>>decodeFromJavaUTF8:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3110
diff changeset
  1871
    Verbose ifTrue:[
0b6a9ff08acd Class reading optimization [1/4]: optimize CharacterArray class>>decodeFromJavaUTF8:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3110
diff changeset
  1872
        self
0b6a9ff08acd Class reading optimization [1/4]: optimize CharacterArray class>>decodeFromJavaUTF8:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3110
diff changeset
  1873
            info: 'reading methodref; classindex=' , classIndex printString , ' nameAndTypeIndex='
0b6a9ff08acd Class reading optimization [1/4]: optimize CharacterArray class>>decodeFromJavaUTF8:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3110
diff changeset
  1874
                    , nameAndTypeIndex printString.
0b6a9ff08acd Class reading optimization [1/4]: optimize CharacterArray class>>decodeFromJavaUTF8:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3110
diff changeset
  1875
    ].
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  1876
    ^ JavaMethodRef2
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1877
        in: constants
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1878
        withNameAndTypeAt: nameAndTypeIndex
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1879
        andClassAt: classIndex.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1880
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1881
    "Modified: / 15-05-2011 / 14:20:38 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
3195
0b6a9ff08acd Class reading optimization [1/4]: optimize CharacterArray class>>decodeFromJavaUTF8:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3110
diff changeset
  1882
    "Modified: / 04-08-2014 / 15:38:24 / Jan Vrany <jan.vrany@fit.cvut.cz>"
1
083530508d9c intitial checkin
cg
parents:
diff changeset
  1883
!
083530508d9c intitial checkin
cg
parents:
diff changeset
  1884
91
9b325648aa77 resolve rewritten; interpreter fixes
cg
parents: 86
diff changeset
  1885
readConstant_NameAndType
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1886
    | nameIndex  descriptorIndex |
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1887
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1888
    nameIndex := inStream nextUnsignedShortMSB: msb.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1889
    descriptorIndex := inStream nextUnsignedShortMSB: msb.
3195
0b6a9ff08acd Class reading optimization [1/4]: optimize CharacterArray class>>decodeFromJavaUTF8:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3110
diff changeset
  1890
    Verbose ifTrue:[
0b6a9ff08acd Class reading optimization [1/4]: optimize CharacterArray class>>decodeFromJavaUTF8:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3110
diff changeset
  1891
        self
0b6a9ff08acd Class reading optimization [1/4]: optimize CharacterArray class>>decodeFromJavaUTF8:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3110
diff changeset
  1892
            info: 'reading nameAndType; nameindex=' , nameIndex printString
0b6a9ff08acd Class reading optimization [1/4]: optimize CharacterArray class>>decodeFromJavaUTF8:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3110
diff changeset
  1893
                    , ' descriptorIndex= ' , descriptorIndex printString.
0b6a9ff08acd Class reading optimization [1/4]: optimize CharacterArray class>>decodeFromJavaUTF8:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3110
diff changeset
  1894
    ].
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  1895
    ^JavaNameAndType2
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1896
                in: constants
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1897
                withNameAt: nameIndex
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1898
                andDescriptorAt: descriptorIndex.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1899
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1900
    "Modified: / 10-05-2011 / 17:09:47 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
3195
0b6a9ff08acd Class reading optimization [1/4]: optimize CharacterArray class>>decodeFromJavaUTF8:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3110
diff changeset
  1901
    "Modified: / 04-08-2014 / 15:38:08 / Jan Vrany <jan.vrany@fit.cvut.cz>"
1
083530508d9c intitial checkin
cg
parents:
diff changeset
  1902
!
083530508d9c intitial checkin
cg
parents:
diff changeset
  1903
083530508d9c intitial checkin
cg
parents:
diff changeset
  1904
readConstant_String
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  1905
    | string_index |
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1906
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1907
    string_index := inStream nextUnsignedShortMSB: msb.
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  1908
    ^ JavaStringRef2 in: constants withValueAt: string_index.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  1909
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  1910
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  1911
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1912
    "Created: / 15-04-1996 / 15:20:33 / cg"
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1913
    "Modified: / 07-05-1998 / 11:42:45 / cg"
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1914
    "Modified: / 13-05-2011 / 17:31:54 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1915
    "Modified: / 10-08-2011 / 23:25:53 / Jan Vrany <jan.vrany@fit.cvut.cz>"
695
fd5acdd14995 utf8 string decoding
cg
parents: 667
diff changeset
  1916
!
fd5acdd14995 utf8 string decoding
cg
parents: 667
diff changeset
  1917
fd5acdd14995 utf8 string decoding
cg
parents: 667
diff changeset
  1918
readConstant_Unicode
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1919
    | len  string  ascii |
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1920
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1921
    len := inStream nextUnsignedShortMSB: msb.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1922
    string := TwoByteString new: len.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1923
    1 to: len
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  1924
        do:
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  1925
            [:idx |
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1926
            ascii := inStream nextUnsignedShortMSB: msb.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1927
            string at: idx put: (Character value: ascii). ].
3275
881799d310e3 Intern all constant pool strings.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3198
diff changeset
  1928
    string := InternedStrings elementAt: string ifAbsent: [ InternedStrings add: string ].
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  1929
    Verbose
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  1930
        ifTrue:
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1931
            [ Transcript
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1932
                show: 'asciz; unicodeString= ';
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1933
                showCR: string ].
695
fd5acdd14995 utf8 string decoding
cg
parents: 667
diff changeset
  1934
    ^ string
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1935
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1936
    "Modified: / 13-05-2011 / 17:31:44 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
3275
881799d310e3 Intern all constant pool strings.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3198
diff changeset
  1937
    "Modified: / 13-11-2014 / 11:53:51 / Jan Vrany <jan.vrany@fit.cvut.cz>"
695
fd5acdd14995 utf8 string decoding
cg
parents: 667
diff changeset
  1938
!
fd5acdd14995 utf8 string decoding
cg
parents: 667
diff changeset
  1939
fd5acdd14995 utf8 string decoding
cg
parents: 667
diff changeset
  1940
readConstant_Utf8
3195
0b6a9ff08acd Class reading optimization [1/4]: optimize CharacterArray class>>decodeFromJavaUTF8:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3110
diff changeset
  1941
    | len string |
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1942
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1943
    len := inStream nextUnsignedShortMSB: msb.
3195
0b6a9ff08acd Class reading optimization [1/4]: optimize CharacterArray class>>decodeFromJavaUTF8:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3110
diff changeset
  1944
    string  := String uninitializedNew: len.
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  1945
    inStream
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1946
        nextBytes: len
3195
0b6a9ff08acd Class reading optimization [1/4]: optimize CharacterArray class>>decodeFromJavaUTF8:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3110
diff changeset
  1947
        into: string
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1948
        startingAt: 1.
3195
0b6a9ff08acd Class reading optimization [1/4]: optimize CharacterArray class>>decodeFromJavaUTF8:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3110
diff changeset
  1949
    string := CharacterArray decodeFromJavaUTF8: string.
3275
881799d310e3 Intern all constant pool strings.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3198
diff changeset
  1950
    string := InternedStrings elementAt: string ifAbsent: [ InternedStrings add: string ].
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  1951
    Verbose
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  1952
        ifTrue:
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1953
            [ Transcript
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1954
                show: 'asciz; string= ';
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1955
                showCR: string ].
695
fd5acdd14995 utf8 string decoding
cg
parents: 667
diff changeset
  1956
    ^ string
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1957
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1958
    "Modified: / 13-05-2011 / 17:31:48 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
3275
881799d310e3 Intern all constant pool strings.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3198
diff changeset
  1959
    "Modified: / 13-11-2014 / 11:53:45 / Jan Vrany <jan.vrany@fit.cvut.cz>"
344
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  1960
! !
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  1961
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  1962
!JavaClassReader methodsFor:'file reading - constants-ST'!
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  1963
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  1964
readConstant_ST_Array
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  1965
    |aSize arr|
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  1966
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  1967
    aSize := inStream nextUnsignedShortMSB:msb.
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  1968
    arr := Array new:aSize.
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  1969
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  1970
    1 to:aSize do:[:i |
350
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1971
        |element_index element|
344
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  1972
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  1973
        element_index := inStream nextUnsignedShortMSB:msb.
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  1974
        arr at:i put:element_index.
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  1975
    ].
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  1976
    Verbose ifTrue:[Transcript show:'array; size= ';     showCR:aSize].
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  1977
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  1978
    ^ JavaUnresolvedSTArrayConstant
344
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  1979
                pool:constants
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  1980
                poolIndex:constSlot
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  1981
                array:arr
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  1982
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  1983
    "Created: / 7.5.1998 / 11:47:01 / cg"
350
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1984
    "Modified: / 9.5.1998 / 00:25:34 / cg"
344
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  1985
!
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  1986
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  1987
readConstant_ST_ByteArray
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  1988
    |aSize arr|
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  1989
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  1990
    aSize := inStream nextUnsignedShortMSB:msb.
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  1991
    arr := ByteArray new:aSize.
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  1992
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  1993
    1 to:aSize do:[:i |
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  1994
        |element_index|
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  1995
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  1996
        arr at:i put:(inStream nextByte).
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  1997
    ].
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  1998
    Verbose ifTrue:[Transcript show:'byteArray; size= ';     showCR:aSize].
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  1999
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  2000
    ^ arr
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  2001
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  2002
    "Created: / 7.5.1998 / 11:47:12 / cg"
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  2003
!
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  2004
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  2005
readConstant_ST_Character
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  2006
    |ascii|
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  2007
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  2008
    ascii := inStream nextUnsignedShortMSB:msb.
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  2009
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  2010
    Verbose ifTrue:[Transcript show:'char; ascii= '; showCR:ascii].
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  2011
    ^ Character value:ascii
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  2012
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  2013
    "Created: / 7.5.1998 / 11:48:12 / cg"
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  2014
!
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  2015
350
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  2016
readConstant_ST_Special
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  2017
    |type|
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  2018
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  2019
    type := inStream nextUnsignedShortMSB:msb.
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  2020
    ^ #(
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  2021
        nil
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  2022
        true
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  2023
        false
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  2024
     ) at:(type + 1)
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  2025
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  2026
    "Created: / 8.5.1998 / 23:06:56 / cg"
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  2027
    "Modified: / 9.5.1998 / 00:40:14 / cg"
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  2028
!
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  2029
344
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  2030
readConstant_ST_String
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  2031
    | tag  string_index  chars |
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  2032
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  2033
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  2034
    string_index := inStream nextUnsignedShortMSB: msb.
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  2035
    Verbose
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  2036
        ifTrue:
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  2037
            [ Transcript
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  2038
                show: 'string; index= ';
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  2039
                showCR: string_index ].
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  2040
344
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  2041
    "/ resolve here if possible
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  2042
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  2043
    string_index < constSlot
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  2044
        ifTrue:
3291
2cf782f380f2 JavaClass memory optimization (part 2)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3290
diff changeset
  2045
            [ chars := (self constantPoolAt: string_index).
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  2046
            ^ chars ].
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  2047
    ^ JavaUnresolvedSTStringConstant
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  2048
        pool: constants
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  2049
        poolIndex: constSlot
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  2050
        stringIndex: string_index
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  2051
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  2052
    "Created: / 07-05-1998 / 11:49:55 / cg"
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  2053
    "Modified: / 13-05-2011 / 17:32:03 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
344
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  2054
!
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  2055
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  2056
readConstant_ST_Symbol
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  2057
    | tag  string_index  chars |
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  2058
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  2059
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  2060
    string_index := inStream nextUnsignedShortMSB: msb.
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  2061
    Verbose
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  2062
        ifTrue:
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  2063
            [ Transcript
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  2064
                show: 'symbol; index= ';
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  2065
                showCR: string_index ].
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  2066
344
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  2067
    "/ resolve here if possible
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  2068
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  2069
    string_index < constSlot
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  2070
        ifTrue:
3291
2cf782f380f2 JavaClass memory optimization (part 2)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3290
diff changeset
  2071
            [ chars := (self constantPoolAt: string_index).
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  2072
            chars isString ifFalse: [ self halt: 'should not happen' ].
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  2073
            ^ chars asSymbol ].
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  2074
    ^ JavaUnresolvedSTSymbolConstant
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  2075
        pool: constants
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  2076
        poolIndex: constSlot
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  2077
        stringIndex: string_index
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  2078
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  2079
    "Modified: / 07-05-1998 / 11:48:28 / cg"
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  2080
    "Modified: / 13-05-2011 / 17:32:09 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
5
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
  2081
! !
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
  2082
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  2083
!JavaClassReader methodsFor:'file reading - extensions'!
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  2084
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  2085
readExtensionsFor: class
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  2086
    "Given a class, load extensions (i.e., non-java methods) for that class"
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  2087
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  2088
    | classnameAsPath |
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  2089
2841
6fa1bcf9c997 JavaClass>>#name vs. #binaryName refactoring
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2812
diff changeset
  2090
    classnameAsPath := class binaryName copyReplaceAll: $/ with: Filename separator.
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  2091
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  2092
    Java effectiveExtensionsPath do:[:each|
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  2093
        ProgrammingLanguage allDo:[:lang|
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  2094
            lang supportsExtensionMethods ifTrue:[
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  2095
                | file |
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  2096
                file := each asString , Filename separator , classnameAsPath , '.' , lang sourceFileSuffix.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  2097
                file := file asFilename.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  2098
                file exists ifTrue:[
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  2099
                    self readExtensionsFor: class from: file language: lang
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  2100
                ]
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  2101
            ]
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  2102
        ]
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  2103
    ]
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  2104
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  2105
    "Created: / 06-09-2012 / 11:37:15 / Jan Vrany <jan.vrany@fit.cvut.cz>"
2841
6fa1bcf9c997 JavaClass>>#name vs. #binaryName refactoring
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2812
diff changeset
  2106
    "Modified: / 08-10-2013 / 22:59:46 / Jan Vrany <jan.vrany@fit.cvut.cz>"
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  2107
!
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  2108
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  2109
readExtensionsFor: class from: file
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  2110
    "Given a class, load extensions (i.e., non-java methods) for that class"
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  2111
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  2112
    JAVA isNil ifTrue:[ JavaPackage initialize ].
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  2113
    [
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  2114
        Smalltalk fileIn: file.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  2115
    ] on: JavaClassQuery do:[:query |
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  2116
        query className = class name ifTrue:[
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  2117
            query resumeWith: class
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  2118
        ] ifFalse:[
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  2119
            query resumeWith: nil.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  2120
        ]
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  2121
    ].
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  2122
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  2123
    "Created: / 06-09-2012 / 12:04:54 / Jan Vrany <jan.vrany@fit.cvut.cz>"
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  2124
!
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  2125
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  2126
readExtensionsFor: class from: file language: language
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  2127
    "Given a class, load extensions (i.e., non-java methods) for that class"
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  2128
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  2129
    JAVA isNil ifTrue:[ JavaPackage initialize ].
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  2130
    [
2812
7cd5e50a6c5a Load java extension methods silently.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2732
diff changeset
  2131
        | wasSilent |
7cd5e50a6c5a Load java extension methods silently.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2732
diff changeset
  2132
7cd5e50a6c5a Load java extension methods silently.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2732
diff changeset
  2133
        wasSilent := Smalltalk silentLoading.
7cd5e50a6c5a Load java extension methods silently.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2732
diff changeset
  2134
        Smalltalk silentLoading: true.
7cd5e50a6c5a Load java extension methods silently.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2732
diff changeset
  2135
        [
7cd5e50a6c5a Load java extension methods silently.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2732
diff changeset
  2136
            Class withoutUpdatingChangesDo:[
7cd5e50a6c5a Load java extension methods silently.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2732
diff changeset
  2137
                language fileIn: file.
7cd5e50a6c5a Load java extension methods silently.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2732
diff changeset
  2138
            ].
7cd5e50a6c5a Load java extension methods silently.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2732
diff changeset
  2139
        ] ensure:[
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  2140
            Smalltalk silentLoading: wasSilent
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  2141
        ].
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  2142
    ] on: JavaClassQuery do:[:query |
2841
6fa1bcf9c997 JavaClass>>#name vs. #binaryName refactoring
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2812
diff changeset
  2143
        query className = class binaryName ifTrue:[
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  2144
            query resumeWith: class
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  2145
        ] ifFalse:[
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  2146
            query resumeWith: nil.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  2147
        ]
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  2148
    ].
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  2149
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  2150
    "Created: / 06-09-2012 / 12:14:01 / Jan Vrany <jan.vrany@fit.cvut.cz>"
2812
7cd5e50a6c5a Load java extension methods silently.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2732
diff changeset
  2151
    "Modified: / 08-10-2013 / 11:12:04 / Jan Vrany <jan.vrany@fit.cvut.cz>"
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  2152
! !
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  2153
5
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
  2154
!JavaClassReader methodsFor:'file reading - fields'!
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
  2155
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
  2156
readConstantValueAttributeFor:aField
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
  2157
    |attribute_length constantvalue_index constantValue|
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
  2158
128
acc4e8e77092 *** empty log message ***
cg
parents: 122
diff changeset
  2159
    attribute_length := inStream nextUnsignedLongMSB:msb.
5
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
  2160
128
acc4e8e77092 *** empty log message ***
cg
parents: 122
diff changeset
  2161
    constantvalue_index := inStream nextUnsignedShortMSB:msb.
3291
2cf782f380f2 JavaClass memory optimization (part 2)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3290
diff changeset
  2162
    constantValue := self constantPoolAt:constantvalue_index.
5
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
  2163
59
38114c3e3e77 checkin from browser
cg
parents: 54
diff changeset
  2164
    aField constantValue:constantValue.
38114c3e3e77 checkin from browser
cg
parents: 54
diff changeset
  2165
61
ff1579eb825f showCr: -> showCR:
cg
parents: 60
diff changeset
  2166
    Verbose ifTrue:[Transcript show:'constantValue: '; showCR:constantValue].
5
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
  2167
    ^ true
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
  2168
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
  2169
    "
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
  2170
     JavaClassReader readFile:'/phys/ibm3/hotjava/classes/browser/AddButton.class'
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
  2171
     JavaClassReader readFile:'/phys/ibm3/hotjava/classes/browser/Alignable.class'
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
  2172
    "
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
  2173
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
  2174
    "Modified: 15.4.1996 / 15:33:28 / cg"
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
  2175
    "Created: 15.4.1996 / 15:40:17 / cg"
1
083530508d9c intitial checkin
cg
parents:
diff changeset
  2176
!
083530508d9c intitial checkin
cg
parents:
diff changeset
  2177
083530508d9c intitial checkin
cg
parents:
diff changeset
  2178
readFieldInfofield
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  2179
    | access_flags  name_index  descriptor_index  attributes_count  field |
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  2180
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  2181
    access_flags := inStream nextUnsignedShortMSB: msb.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  2182
    name_index := inStream nextUnsignedShortMSB: msb.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  2183
    descriptor_index := inStream nextUnsignedShortMSB: msb.
5
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
  2184
    field := JavaField new.
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  2185
    field setAccessFlags: access_flags.
3291
2cf782f380f2 JavaClass memory optimization (part 2)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3290
diff changeset
  2186
    field setName: (self constantPoolAt: name_index) asSymbol.
2cf782f380f2 JavaClass memory optimization (part 2)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3290
diff changeset
  2187
    field setDescriptor: (self constantPoolAt: descriptor_index) asSymbol.
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  2188
    attributes_count := inStream nextUnsignedShortMSB: msb.
2729
ac412f6ea6d4 More support for method's source display. Not yet working.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2591
diff changeset
  2189
    attributes := OrderedCollection new: attributes_count * 2.
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  2190
    Verbose
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  2191
        ifTrue:
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  2192
            [ Transcript
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  2193
                show: '  field name: ';
3291
2cf782f380f2 JavaClass memory optimization (part 2)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3290
diff changeset
  2194
                show: (self constantPoolAt: name_index);
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  2195
                show: ' access: ';
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  2196
                show: access_flags;
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  2197
                show: ' attrib_cnt: ';
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  2198
                showCR: attributes_count ].
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  2199
    1 to: attributes_count do: [:i | self readAttributeFor: field. ].
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  2200
    ^ field.
27
4560bb77bb36 checkin from browser
cg
parents: 21
diff changeset
  2201
1
083530508d9c intitial checkin
cg
parents:
diff changeset
  2202
    "
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  2203
     JavaClassReader readFile:'/phys/ibm3/hotjava/classes/browser/AddButton.class'"
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  2204
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  2205
    "Created: / 15-04-1996 / 15:38:43 / cg"
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  2206
    "Modified: / 15-10-1998 / 10:38:01 / cg"
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  2207
    "Modified: / 17-12-2010 / 18:44:30 / Marcel Hlopko <hlopik@gmail.com>"
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  2208
    "Modified: / 18-05-2011 / 14:11:37 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
3294
1013708261a8 JavaClass memory optimization (part 5)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3293
diff changeset
  2209
    "Modified: / 08-12-2014 / 16:25:41 / Jan Vrany <jan.vrany@fit.cvut.cz>"
1
083530508d9c intitial checkin
cg
parents:
diff changeset
  2210
!
083530508d9c intitial checkin
cg
parents:
diff changeset
  2211
083530508d9c intitial checkin
cg
parents:
diff changeset
  2212
readFieldInfofields
38
3f1b61722466 checkin from browser
cg
parents: 32
diff changeset
  2213
    |nFields fields|
1
083530508d9c intitial checkin
cg
parents:
diff changeset
  2214
083530508d9c intitial checkin
cg
parents:
diff changeset
  2215
    "/
38
3f1b61722466 checkin from browser
cg
parents: 32
diff changeset
  2216
    "/ get fieldInfos
1
083530508d9c intitial checkin
cg
parents:
diff changeset
  2217
    "/
128
acc4e8e77092 *** empty log message ***
cg
parents: 122
diff changeset
  2218
    nFields := inStream nextUnsignedShortMSB:msb.
61
ff1579eb825f showCr: -> showCR:
cg
parents: 60
diff changeset
  2219
    Verbose ifTrue:[Transcript show:'fieldsCount = '; showCR:nFields].
1
083530508d9c intitial checkin
cg
parents:
diff changeset
  2220
27
4560bb77bb36 checkin from browser
cg
parents: 21
diff changeset
  2221
    fields := Array new:nFields.
4560bb77bb36 checkin from browser
cg
parents: 21
diff changeset
  2222
4560bb77bb36 checkin from browser
cg
parents: 21
diff changeset
  2223
    1 to:nFields do:[:i |
252
04b330744577 new javaVM stuff & back to pre-stefans changes
cg
parents: 229
diff changeset
  2224
	Verbose ifTrue:[Transcript show:'field: '; showCR:i].
04b330744577 new javaVM stuff & back to pre-stefans changes
cg
parents: 229
diff changeset
  2225
	fields at:i put:(self readFieldInfofield)
1
083530508d9c intitial checkin
cg
parents:
diff changeset
  2226
    ].
38
3f1b61722466 checkin from browser
cg
parents: 32
diff changeset
  2227
    ^ fields
1
083530508d9c intitial checkin
cg
parents:
diff changeset
  2228
083530508d9c intitial checkin
cg
parents:
diff changeset
  2229
    "
083530508d9c intitial checkin
cg
parents:
diff changeset
  2230
     JavaClassReader readFile:'/phys/ibm3/hotjava/classes/browser/AddButton.class'
083530508d9c intitial checkin
cg
parents:
diff changeset
  2231
    "
083530508d9c intitial checkin
cg
parents:
diff changeset
  2232
083530508d9c intitial checkin
cg
parents:
diff changeset
  2233
    "Created: 15.4.1996 / 15:34:41 / cg"
083530508d9c intitial checkin
cg
parents:
diff changeset
  2234
    "Modified: 15.4.1996 / 15:35:28 / cg"
5
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
  2235
! !
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
  2236
38
3f1b61722466 checkin from browser
cg
parents: 32
diff changeset
  2237
!JavaClassReader methodsFor:'file reading - interfaces'!
3f1b61722466 checkin from browser
cg
parents: 32
diff changeset
  2238
3f1b61722466 checkin from browser
cg
parents: 32
diff changeset
  2239
readInterfaces
3290
76d4443744ed JavaClass memory optimization (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3289
diff changeset
  2240
    | interfacesCount interface_index interfaces |
38
3f1b61722466 checkin from browser
cg
parents: 32
diff changeset
  2241
3f1b61722466 checkin from browser
cg
parents: 32
diff changeset
  2242
    "/
3f1b61722466 checkin from browser
cg
parents: 32
diff changeset
  2243
    "/ get interfaces
3f1b61722466 checkin from browser
cg
parents: 32
diff changeset
  2244
    "/
128
acc4e8e77092 *** empty log message ***
cg
parents: 122
diff changeset
  2245
    interfacesCount := inStream nextUnsignedShortMSB:msb.
61
ff1579eb825f showCr: -> showCR:
cg
parents: 60
diff changeset
  2246
    Verbose ifTrue:[Transcript show:'interfacesCount = '; showCR:interfacesCount].
38
3f1b61722466 checkin from browser
cg
parents: 32
diff changeset
  2247
3f1b61722466 checkin from browser
cg
parents: 32
diff changeset
  2248
    interfaces := Array new:interfacesCount.
3f1b61722466 checkin from browser
cg
parents: 32
diff changeset
  2249
3f1b61722466 checkin from browser
cg
parents: 32
diff changeset
  2250
    1 to:interfacesCount do:[:i |
3290
76d4443744ed JavaClass memory optimization (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3289
diff changeset
  2251
        Verbose ifTrue:[Transcript show:'interface: '; showCR:i].
76d4443744ed JavaClass memory optimization (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3289
diff changeset
  2252
        interface_index := inStream nextUnsignedShortMSB:msb.
76d4443744ed JavaClass memory optimization (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3289
diff changeset
  2253
        interfaces at:i put:interface_index.
38
3f1b61722466 checkin from browser
cg
parents: 32
diff changeset
  2254
    ].
3f1b61722466 checkin from browser
cg
parents: 32
diff changeset
  2255
    ^ interfaces
3f1b61722466 checkin from browser
cg
parents: 32
diff changeset
  2256
3f1b61722466 checkin from browser
cg
parents: 32
diff changeset
  2257
    "
3f1b61722466 checkin from browser
cg
parents: 32
diff changeset
  2258
     JavaClassReader readFile:'/phys/ibm3/hotjava/classes/browser/AddButton.class'
3f1b61722466 checkin from browser
cg
parents: 32
diff changeset
  2259
    "
3f1b61722466 checkin from browser
cg
parents: 32
diff changeset
  2260
3290
76d4443744ed JavaClass memory optimization (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3289
diff changeset
  2261
    "Created: / 15-04-1996 / 15:31:59 / cg"
76d4443744ed JavaClass memory optimization (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3289
diff changeset
  2262
    "Modified: / 27-11-2014 / 16:55:56 / Jan Vrany <jan.vrany@fit.cvut.cz>"
38
3f1b61722466 checkin from browser
cg
parents: 32
diff changeset
  2263
! !
3f1b61722466 checkin from browser
cg
parents: 32
diff changeset
  2264
5
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
  2265
!JavaClassReader methodsFor:'file reading - methods'!
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
  2266
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
  2267
readCodeAttributeFor:aJavaMethod
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
  2268
    |attribute_length max_stack max_locals code_length code
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  2269
     exception_table_length exception_table unknown1 unknown2 |
1
083530508d9c intitial checkin
cg
parents:
diff changeset
  2270
128
acc4e8e77092 *** empty log message ***
cg
parents: 122
diff changeset
  2271
    attribute_length := inStream nextUnsignedLongMSB:msb.
1
083530508d9c intitial checkin
cg
parents:
diff changeset
  2272
357
90d866d87398 more st-class reading
cg
parents: 355
diff changeset
  2273
    Verbose ifTrue:[Transcript show:'code_attribute_length: 0x'; showCR:(attribute_length printStringRadix:16)].
9
bc65152d7610 can no read (undoc) 3.45 format
cg
parents: 7
diff changeset
  2274
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  2275
    ((minorVsn > 2) or:[majorVsn > 45]) ifTrue:[
348
10725e1a2aee more st-class reading
cg
parents: 344
diff changeset
  2276
        "/ should be:
10725e1a2aee more st-class reading
cg
parents: 344
diff changeset
  2277
        max_stack := inStream nextUnsignedShortMSB:msb.
10725e1a2aee more st-class reading
cg
parents: 344
diff changeset
  2278
        max_locals := inStream nextUnsignedShortMSB:msb.
10725e1a2aee more st-class reading
cg
parents: 344
diff changeset
  2279
        code_length := inStream nextUnsignedLongMSB:msb.
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  2280
        "/ Remember max context size so far, will be used to
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  2281
        "/ optimize context size as alloca() won't work.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  2282
        MaxContextSize := MaxContextSize max: (max_stack + max_locals + 4"safe area").
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  2283
"
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  2284
        MaxContextSize > MaxContextSizeLimit ifTrue:[
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  2285
            self error:'method''s stack depth overflows VM limit'.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  2286
            ^false
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  2287
        ].
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  2288
"
348
10725e1a2aee more st-class reading
cg
parents: 344
diff changeset
  2289
10725e1a2aee more st-class reading
cg
parents: 344
diff changeset
  2290
"/        unknown1 := inStream nextByte.
10725e1a2aee more st-class reading
cg
parents: 344
diff changeset
  2291
"/        max_stack := inStream nextByte.
10725e1a2aee more st-class reading
cg
parents: 344
diff changeset
  2292
"/        max_locals := inStream nextUnsignedShortMSB:msb.
10725e1a2aee more st-class reading
cg
parents: 344
diff changeset
  2293
"/        unknown2 := inStream nextUnsignedShortMSB:msb.
10725e1a2aee more st-class reading
cg
parents: 344
diff changeset
  2294
"/        code_length := inStream nextUnsignedShortMSB:msb.
10725e1a2aee more st-class reading
cg
parents: 344
diff changeset
  2295
"/        Verbose ifTrue:[Transcript show:'?1: '; showCR:unknown1].
10725e1a2aee more st-class reading
cg
parents: 344
diff changeset
  2296
"/        Verbose ifTrue:[Transcript show:'?2: '; showCR:unknown2].
39
20fa5af3b873 checkin from browser
cg
parents: 38
diff changeset
  2297
    ] ifFalse:[
348
10725e1a2aee more st-class reading
cg
parents: 344
diff changeset
  2298
        max_stack := inStream nextByte.
10725e1a2aee more st-class reading
cg
parents: 344
diff changeset
  2299
        max_locals := inStream nextByte.
10725e1a2aee more st-class reading
cg
parents: 344
diff changeset
  2300
        code_length := inStream nextUnsignedShortMSB:msb.
9
bc65152d7610 can no read (undoc) 3.45 format
cg
parents: 7
diff changeset
  2301
    ].
bc65152d7610 can no read (undoc) 3.45 format
cg
parents: 7
diff changeset
  2302
357
90d866d87398 more st-class reading
cg
parents: 355
diff changeset
  2303
    Verbose ifTrue:[
90d866d87398 more st-class reading
cg
parents: 355
diff changeset
  2304
        Transcript show:'code_length: '; showCR:(code_length printStringRadix:16).
90d866d87398 more st-class reading
cg
parents: 355
diff changeset
  2305
        Transcript show:'code at pos: '; showCR:inStream position
90d866d87398 more st-class reading
cg
parents: 355
diff changeset
  2306
    ].
38
3f1b61722466 checkin from browser
cg
parents: 32
diff changeset
  2307
357
90d866d87398 more st-class reading
cg
parents: 355
diff changeset
  2308
    code_length ~~ 0 ifTrue:[
90d866d87398 more st-class reading
cg
parents: 355
diff changeset
  2309
        code := ByteArray new:code_length.
90d866d87398 more st-class reading
cg
parents: 355
diff changeset
  2310
        inStream nextBytes:code_length into:code startingAt:1.
90d866d87398 more st-class reading
cg
parents: 355
diff changeset
  2311
    ].
90d866d87398 more st-class reading
cg
parents: 355
diff changeset
  2312
    Verbose ifTrue:[Transcript show:'method code: '; showCR:code.].
9
bc65152d7610 can no read (undoc) 3.45 format
cg
parents: 7
diff changeset
  2313
128
acc4e8e77092 *** empty log message ***
cg
parents: 122
diff changeset
  2314
    exception_table_length := inStream nextUnsignedShortMSB:msb.
61
ff1579eb825f showCr: -> showCR:
cg
parents: 60
diff changeset
  2315
    Verbose ifTrue:[Transcript show:'exception_table_length: '; showCR:(exception_table_length printStringRadix:16)].
5
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
  2316
    exception_table_length ~~ 0 ifTrue:[
348
10725e1a2aee more st-class reading
cg
parents: 344
diff changeset
  2317
        Verbose ifTrue:[Transcript show:'exceptionTable length:'; showCR:exception_table_length.].
9
bc65152d7610 can no read (undoc) 3.45 format
cg
parents: 7
diff changeset
  2318
2585
14ab287e17ca Exception table refactored to use more compact & VM friendly format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2578
diff changeset
  2319
        exception_table := JavaExceptionTable new:exception_table_length * 4.
348
10725e1a2aee more st-class reading
cg
parents: 344
diff changeset
  2320
        1 to:exception_table_length do:[:i |
2585
14ab287e17ca Exception table refactored to use more compact & VM friendly format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2578
diff changeset
  2321
14ab287e17ca Exception table refactored to use more compact & VM friendly format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2578
diff changeset
  2322
            "/ start PC
14ab287e17ca Exception table refactored to use more compact & VM friendly format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2578
diff changeset
  2323
            exception_table at:((i-1) * 4) + 1 put: (inStream nextUnsignedShortMSB:msb).
14ab287e17ca Exception table refactored to use more compact & VM friendly format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2578
diff changeset
  2324
            "/ end PC
14ab287e17ca Exception table refactored to use more compact & VM friendly format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2578
diff changeset
  2325
            exception_table at:((i-1) * 4) + 2 put: (inStream nextUnsignedShortMSB:msb).
14ab287e17ca Exception table refactored to use more compact & VM friendly format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2578
diff changeset
  2326
            "/ handler PC
14ab287e17ca Exception table refactored to use more compact & VM friendly format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2578
diff changeset
  2327
            exception_table at:((i-1) * 4) + 3 put: (inStream nextUnsignedShortMSB:msb).
14ab287e17ca Exception table refactored to use more compact & VM friendly format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2578
diff changeset
  2328
            "/ catch type
14ab287e17ca Exception table refactored to use more compact & VM friendly format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2578
diff changeset
  2329
            exception_table at:((i-1) * 4) + 4 put: (inStream nextUnsignedShortMSB:msb).
348
10725e1a2aee more st-class reading
cg
parents: 344
diff changeset
  2330
        ].
10725e1a2aee more st-class reading
cg
parents: 344
diff changeset
  2331
        aJavaMethod setExceptionHandlerTable:exception_table.
1
083530508d9c intitial checkin
cg
parents:
diff changeset
  2332
    ].
083530508d9c intitial checkin
cg
parents:
diff changeset
  2333
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  2334
    (max_stack + max_locals + 4) > MaxContextSizeLimit ifTrue:[
2585
14ab287e17ca Exception table refactored to use more compact & VM friendly format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2578
diff changeset
  2335
        code := nil
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  2336
    ].
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  2337
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  2338
    aJavaMethod
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  2339
        setCode:code
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  2340
        maxStack:max_stack
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  2341
        maxLocals:max_locals
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  2342
        u1:unknown1
348
10725e1a2aee more st-class reading
cg
parents: 344
diff changeset
  2343
        u2:unknown2.
5
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
  2344
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
  2345
    self readAttributesFor:aJavaMethod.
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
  2346
    ^ true
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
  2347
1
083530508d9c intitial checkin
cg
parents:
diff changeset
  2348
    "
083530508d9c intitial checkin
cg
parents:
diff changeset
  2349
     JavaClassReader readFile:'/phys/ibm3/hotjava/classes/browser/AddButton.class'
5
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
  2350
     JavaClassReader readFile:'/phys/ibm3/hotjava/classes/browser/Alignable.class'
1
083530508d9c intitial checkin
cg
parents:
diff changeset
  2351
    "
083530508d9c intitial checkin
cg
parents:
diff changeset
  2352
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  2353
    "Created: / 15-04-1996 / 15:40:17 / cg"
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  2354
    "Modified: / 16-05-1998 / 01:39:42 / cg"
2585
14ab287e17ca Exception table refactored to use more compact & VM friendly format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2578
diff changeset
  2355
    "Modified: / 06-05-2013 / 22:08:10 / Jan Vrany <jan.vrany@fit.cvut.cz>"
5
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
  2356
!
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
  2357
83
2d61ef3579e4 *** empty log message ***
cg
parents: 73
diff changeset
  2358
readExceptionsAttributeFor:aJavaMethod
2d61ef3579e4 *** empty log message ***
cg
parents: 73
diff changeset
  2359
    |attribute_length exception_table_length exception_table|
2d61ef3579e4 *** empty log message ***
cg
parents: 73
diff changeset
  2360
128
acc4e8e77092 *** empty log message ***
cg
parents: 122
diff changeset
  2361
    attribute_length := inStream nextUnsignedLongMSB:msb.
83
2d61ef3579e4 *** empty log message ***
cg
parents: 73
diff changeset
  2362
128
acc4e8e77092 *** empty log message ***
cg
parents: 122
diff changeset
  2363
    exception_table_length := inStream nextUnsignedShortMSB:msb.
83
2d61ef3579e4 *** empty log message ***
cg
parents: 73
diff changeset
  2364
    exception_table_length ~~ 0 ifTrue:[
3290
76d4443744ed JavaClass memory optimization (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3289
diff changeset
  2365
        exception_table := Array new:exception_table_length.
76d4443744ed JavaClass memory optimization (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3289
diff changeset
  2366
        1 to:exception_table_length do:[:i |
76d4443744ed JavaClass memory optimization (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3289
diff changeset
  2367
            | idx |
76d4443744ed JavaClass memory optimization (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3289
diff changeset
  2368
76d4443744ed JavaClass memory optimization (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3289
diff changeset
  2369
            idx := inStream nextUnsignedShortMSB:msb.
76d4443744ed JavaClass memory optimization (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3289
diff changeset
  2370
            exception_table at:i put:idx.
76d4443744ed JavaClass memory optimization (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3289
diff changeset
  2371
        ].
83
2d61ef3579e4 *** empty log message ***
cg
parents: 73
diff changeset
  2372
    ].
2d61ef3579e4 *** empty log message ***
cg
parents: 73
diff changeset
  2373
2d61ef3579e4 *** empty log message ***
cg
parents: 73
diff changeset
  2374
    Verbose ifTrue:[Transcript showCR:'method has an exceptionTable'].
2d61ef3579e4 *** empty log message ***
cg
parents: 73
diff changeset
  2375
2d61ef3579e4 *** empty log message ***
cg
parents: 73
diff changeset
  2376
    aJavaMethod setExceptionTable:exception_table.
2d61ef3579e4 *** empty log message ***
cg
parents: 73
diff changeset
  2377
    ^ true
2d61ef3579e4 *** empty log message ***
cg
parents: 73
diff changeset
  2378
3290
76d4443744ed JavaClass memory optimization (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3289
diff changeset
  2379
    "Created: / 15-04-1996 / 15:40:17 / cg"
76d4443744ed JavaClass memory optimization (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3289
diff changeset
  2380
    "Modified: / 04-12-2014 / 14:29:06 / Jan Vrany <jan.vrany@fit.cvut.cz>"
83
2d61ef3579e4 *** empty log message ***
cg
parents: 73
diff changeset
  2381
!
2d61ef3579e4 *** empty log message ***
cg
parents: 73
diff changeset
  2382
5
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
  2383
readLineNumberTableAttributeFor:aJavaMethod
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
  2384
    |attribute_length line_number_table_length line_number_table|
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
  2385
128
acc4e8e77092 *** empty log message ***
cg
parents: 122
diff changeset
  2386
    attribute_length := inStream nextUnsignedLongMSB:msb.
5
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
  2387
128
acc4e8e77092 *** empty log message ***
cg
parents: 122
diff changeset
  2388
    line_number_table_length := inStream nextUnsignedShortMSB:msb.
5
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
  2389
    line_number_table_length ~~ 0 ifTrue:[
330
c452e536a822 checkin from browser
cg
parents: 327
diff changeset
  2390
        line_number_table := Array new:line_number_table_length.
c452e536a822 checkin from browser
cg
parents: 327
diff changeset
  2391
        1 to:line_number_table_length do:[:i |
c452e536a822 checkin from browser
cg
parents: 327
diff changeset
  2392
            |start_pc line_number|
5
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
  2393
330
c452e536a822 checkin from browser
cg
parents: 327
diff changeset
  2394
            start_pc := inStream nextUnsignedShortMSB:msb.
c452e536a822 checkin from browser
cg
parents: 327
diff changeset
  2395
            line_number := inStream nextUnsignedShortMSB:msb.
c452e536a822 checkin from browser
cg
parents: 327
diff changeset
  2396
            line_number_table at:i put:(start_pc -> line_number).
c452e536a822 checkin from browser
cg
parents: 327
diff changeset
  2397
        ].
c452e536a822 checkin from browser
cg
parents: 327
diff changeset
  2398
        Verbose ifTrue:[Transcript showCR:'method has a lineNumberTable'].
c452e536a822 checkin from browser
cg
parents: 327
diff changeset
  2399
c452e536a822 checkin from browser
cg
parents: 327
diff changeset
  2400
        aJavaMethod setLineNumberTable:line_number_table.
5
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
  2401
    ].
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
  2402
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
  2403
    ^ true
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
  2404
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
  2405
    "
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
  2406
     JavaClassReader readFile:'/phys/ibm3/hotjava/classes/browser/AddButton.class'
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
  2407
     JavaClassReader readFile:'/phys/ibm3/hotjava/classes/java/lang/Boolean.class'
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
  2408
    "
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
  2409
330
c452e536a822 checkin from browser
cg
parents: 327
diff changeset
  2410
    "Created: / 15.4.1996 / 15:40:17 / cg"
c452e536a822 checkin from browser
cg
parents: 327
diff changeset
  2411
    "Modified: / 7.4.1998 / 19:08:42 / cg"
1
083530508d9c intitial checkin
cg
parents:
diff changeset
  2412
!
083530508d9c intitial checkin
cg
parents:
diff changeset
  2413
50
458467ce0e15 checkin from browser
cg
parents: 43
diff changeset
  2414
readLocalVariableTableAttributeFor:aJavaMethod
458467ce0e15 checkin from browser
cg
parents: 43
diff changeset
  2415
    |attribute_length local_variable_table_length local_variable_table|
458467ce0e15 checkin from browser
cg
parents: 43
diff changeset
  2416
128
acc4e8e77092 *** empty log message ***
cg
parents: 122
diff changeset
  2417
    attribute_length := inStream nextUnsignedLongMSB:msb.
50
458467ce0e15 checkin from browser
cg
parents: 43
diff changeset
  2418
128
acc4e8e77092 *** empty log message ***
cg
parents: 122
diff changeset
  2419
    local_variable_table_length := inStream nextUnsignedShortMSB:msb.
50
458467ce0e15 checkin from browser
cg
parents: 43
diff changeset
  2420
    local_variable_table_length ~~ 0 ifTrue:[
252
04b330744577 new javaVM stuff & back to pre-stefans changes
cg
parents: 229
diff changeset
  2421
	local_variable_table := JavaLocalVariableTable new:local_variable_table_length.
04b330744577 new javaVM stuff & back to pre-stefans changes
cg
parents: 229
diff changeset
  2422
	1 to:local_variable_table_length do:[:i |
04b330744577 new javaVM stuff & back to pre-stefans changes
cg
parents: 229
diff changeset
  2423
	    |start_pc length name_index sig_index slot name signature|
50
458467ce0e15 checkin from browser
cg
parents: 43
diff changeset
  2424
252
04b330744577 new javaVM stuff & back to pre-stefans changes
cg
parents: 229
diff changeset
  2425
	    start_pc := inStream nextUnsignedShortMSB:msb.
04b330744577 new javaVM stuff & back to pre-stefans changes
cg
parents: 229
diff changeset
  2426
	    length := inStream nextUnsignedShortMSB:msb.
04b330744577 new javaVM stuff & back to pre-stefans changes
cg
parents: 229
diff changeset
  2427
	    name_index := inStream nextUnsignedShortMSB:msb.
3291
2cf782f380f2 JavaClass memory optimization (part 2)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3290
diff changeset
  2428
	    name := self constantPoolAt:name_index.
252
04b330744577 new javaVM stuff & back to pre-stefans changes
cg
parents: 229
diff changeset
  2429
	    sig_index := inStream nextUnsignedShortMSB:msb.
3291
2cf782f380f2 JavaClass memory optimization (part 2)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3290
diff changeset
  2430
	    signature := self constantPoolAt:sig_index.
252
04b330744577 new javaVM stuff & back to pre-stefans changes
cg
parents: 229
diff changeset
  2431
	    slot := inStream nextUnsignedShortMSB:msb.
50
458467ce0e15 checkin from browser
cg
parents: 43
diff changeset
  2432
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  2433
	    local_variable_table at:i put:(JavaLocalVariableTableEntry new
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  2434
						startPC:start_pc
252
04b330744577 new javaVM stuff & back to pre-stefans changes
cg
parents: 229
diff changeset
  2435
						length:length
04b330744577 new javaVM stuff & back to pre-stefans changes
cg
parents: 229
diff changeset
  2436
						name:name
04b330744577 new javaVM stuff & back to pre-stefans changes
cg
parents: 229
diff changeset
  2437
						signature:signature
04b330744577 new javaVM stuff & back to pre-stefans changes
cg
parents: 229
diff changeset
  2438
						slot:slot)
04b330744577 new javaVM stuff & back to pre-stefans changes
cg
parents: 229
diff changeset
  2439
	].
50
458467ce0e15 checkin from browser
cg
parents: 43
diff changeset
  2440
    ].
458467ce0e15 checkin from browser
cg
parents: 43
diff changeset
  2441
61
ff1579eb825f showCr: -> showCR:
cg
parents: 60
diff changeset
  2442
    Verbose ifTrue:[Transcript showCR:'method has a localvariableTable'].
50
458467ce0e15 checkin from browser
cg
parents: 43
diff changeset
  2443
458467ce0e15 checkin from browser
cg
parents: 43
diff changeset
  2444
    aJavaMethod setLocalVariableTable:local_variable_table.
458467ce0e15 checkin from browser
cg
parents: 43
diff changeset
  2445
    ^ true
458467ce0e15 checkin from browser
cg
parents: 43
diff changeset
  2446
458467ce0e15 checkin from browser
cg
parents: 43
diff changeset
  2447
    "
458467ce0e15 checkin from browser
cg
parents: 43
diff changeset
  2448
     JavaClassReader readFile:'/phys/ibm3/hotjava/classes/browser/AddButton.class'
458467ce0e15 checkin from browser
cg
parents: 43
diff changeset
  2449
     JavaClassReader readFile:'/phys/ibm3/hotjava/classes/java/lang/Boolean.class'
458467ce0e15 checkin from browser
cg
parents: 43
diff changeset
  2450
    "
458467ce0e15 checkin from browser
cg
parents: 43
diff changeset
  2451
458467ce0e15 checkin from browser
cg
parents: 43
diff changeset
  2452
    "Modified: 15.4.1996 / 15:33:28 / cg"
458467ce0e15 checkin from browser
cg
parents: 43
diff changeset
  2453
    "Created: 15.4.1996 / 15:40:17 / cg"
458467ce0e15 checkin from browser
cg
parents: 43
diff changeset
  2454
!
458467ce0e15 checkin from browser
cg
parents: 43
diff changeset
  2455
3110
2c747ca6078d [JavaClassReader optimization 2/3]: add methods at once instead of individually.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3106
diff changeset
  2456
readMethodFor:aJavaClass into: aMethodDictionary
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  2457
    |m access_flags name_index name descriptor_index descriptor
273
bcbea5ac4860 checkin from browser
cg
parents: 269
diff changeset
  2458
     tooManyArgs|
1
083530508d9c intitial checkin
cg
parents:
diff changeset
  2459
083530508d9c intitial checkin
cg
parents:
diff changeset
  2460
    "/
083530508d9c intitial checkin
cg
parents:
diff changeset
  2461
    "/ get a method
083530508d9c intitial checkin
cg
parents:
diff changeset
  2462
    "/
128
acc4e8e77092 *** empty log message ***
cg
parents: 122
diff changeset
  2463
    access_flags := inStream nextUnsignedShortMSB:msb.
acc4e8e77092 *** empty log message ***
cg
parents: 122
diff changeset
  2464
    name_index := inStream nextUnsignedShortMSB:msb.
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  2465
    descriptor_index := inStream nextUnsignedShortMSB:msb.
1
083530508d9c intitial checkin
cg
parents:
diff changeset
  2466
3291
2cf782f380f2 JavaClass memory optimization (part 2)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3290
diff changeset
  2467
    name := self constantPoolAt:name_index.
2cf782f380f2 JavaClass memory optimization (part 2)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3290
diff changeset
  2468
    descriptor := self constantPoolAt:descriptor_index.
9
bc65152d7610 can no read (undoc) 3.45 format
cg
parents: 7
diff changeset
  2469
357
90d866d87398 more st-class reading
cg
parents: 355
diff changeset
  2470
    Verbose ifTrue:[
90d866d87398 more st-class reading
cg
parents: 355
diff changeset
  2471
        Transcript show:'method name:'; showCR:name.
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  2472
        Transcript show:'descriptor:'; showCR:descriptor.
357
90d866d87398 more st-class reading
cg
parents: 355
diff changeset
  2473
    ].
9
bc65152d7610 can no read (undoc) 3.45 format
cg
parents: 7
diff changeset
  2474
3110
2c747ca6078d [JavaClassReader optimization 2/3]: add methods at once instead of individually.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3106
diff changeset
  2475
    aJavaClass isJavaClass ifTrue:[
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  2476
        (access_flags bitAnd:ACC_NATIVE) ~~ 0 ifTrue:[
612
00e005c99126 create JavaNativeMethod instances for native methods.
cg
parents: 583
diff changeset
  2477
            m := JavaNativeMethod new.
00e005c99126 create JavaNativeMethod instances for native methods.
cg
parents: 583
diff changeset
  2478
        ] ifFalse:[
00e005c99126 create JavaNativeMethod instances for native methods.
cg
parents: 583
diff changeset
  2479
            m := JavaMethodWithHandler new.
00e005c99126 create JavaNativeMethod instances for native methods.
cg
parents: 583
diff changeset
  2480
        ].
357
90d866d87398 more st-class reading
cg
parents: 355
diff changeset
  2481
        m setAccessFlags:access_flags.
3110
2c747ca6078d [JavaClassReader optimization 2/3]: add methods at once instead of individually.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3106
diff changeset
  2482
        m setJavaClass:aJavaClass.
357
90d866d87398 more st-class reading
cg
parents: 355
diff changeset
  2483
        tooManyArgs := false.
3384
98eb8443f4f4 Use new Logger API (use Logger severityXXX instead of symbols)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3324
diff changeset
  2484
        [
98eb8443f4f4 Use new Logger API (use Logger severityXXX instead of symbols)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3324
diff changeset
  2485
            m setName:name descriptor:descriptor.
98eb8443f4f4 Use new Logger API (use Logger severityXXX instead of symbols)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3324
diff changeset
  2486
        ] on: ArgumentError do:[:ex |
98eb8443f4f4 Use new Logger API (use Logger severityXXX instead of symbols)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3324
diff changeset
  2487
            Logger log: 'java method has too many arguments - will fail to execute' severity: Logger severityWARN facility: 'JVM'.
357
90d866d87398 more st-class reading
cg
parents: 355
diff changeset
  2488
            tooManyArgs := true.
90d866d87398 more st-class reading
cg
parents: 355
diff changeset
  2489
            ex proceed.
90d866d87398 more st-class reading
cg
parents: 355
diff changeset
  2490
        ].
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  2491
357
90d866d87398 more st-class reading
cg
parents: 355
diff changeset
  2492
        self readAttributesFor:m.
90d866d87398 more st-class reading
cg
parents: 355
diff changeset
  2493
90d866d87398 more st-class reading
cg
parents: 355
diff changeset
  2494
        tooManyArgs ifTrue:[
90d866d87398 more st-class reading
cg
parents: 355
diff changeset
  2495
            m code:nil.
90d866d87398 more st-class reading
cg
parents: 355
diff changeset
  2496
            m byteCode:nil.
90d866d87398 more st-class reading
cg
parents: 355
diff changeset
  2497
        ].
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  2498
423
08af061c56a8 javaClass now uses its fullName in name
cg
parents: 407
diff changeset
  2499
        (m exceptionHandlerTable isNil) ifTrue:[
612
00e005c99126 create JavaNativeMethod instances for native methods.
cg
parents: 583
diff changeset
  2500
            m isNative ifFalse:[
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  2501
                m getExceptionTable isNil ifTrue:[
612
00e005c99126 create JavaNativeMethod instances for native methods.
cg
parents: 583
diff changeset
  2502
                    m := JavaMethod fromMethod:m
00e005c99126 create JavaNativeMethod instances for native methods.
cg
parents: 583
diff changeset
  2503
                ] ifFalse:[
00e005c99126 create JavaNativeMethod instances for native methods.
cg
parents: 583
diff changeset
  2504
                    m := JavaMethodWithException fromMethod:m
00e005c99126 create JavaNativeMethod instances for native methods.
cg
parents: 583
diff changeset
  2505
                ]
423
08af061c56a8 javaClass now uses its fullName in name
cg
parents: 407
diff changeset
  2506
            ]
468
4d4f1cb9786b *** empty log message ***
cg
parents: 454
diff changeset
  2507
        ] ifFalse:[
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  2508
            | newAccessFlags |
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  2509
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  2510
            newAccessFlags := m accessFlags.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  2511
            newAccessFlags := newAccessFlags bitOr:ACX_HASHANDLER.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  2512
            m hasFinallyBasedOnExceptionTable ifTrue:[
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  2513
                newAccessFlags := newAccessFlags bitOr:ACX_HASFINALLY.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  2514
            ].
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  2515
            m setAccessFlags:newAccessFlags.
386
ed3f417b7d02 checkin from browser
cg
parents: 376
diff changeset
  2516
        ].
3110
2c747ca6078d [JavaClassReader optimization 2/3]: add methods at once instead of individually.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3106
diff changeset
  2517
        aMethodDictionary at: (name , descriptor) asSymbol put: m.
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  2518
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  2519
        ( m selector == #'finalize()V' ) ifTrue:[
3110
2c747ca6078d [JavaClassReader optimization 2/3]: add methods at once instead of individually.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3106
diff changeset
  2520
            ( aJavaClass binaryName ~~ #'java/lang/Object' ) ifTrue:[
2c747ca6078d [JavaClassReader optimization 2/3]: add methods at once instead of individually.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3106
diff changeset
  2521
                aJavaClass setAccessFlags: (aJavaClass accessFlags bitOr:ACX_HASFINALIZE)
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  2522
            ]
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  2523
        ].
357
90d866d87398 more st-class reading
cg
parents: 355
diff changeset
  2524
    ] ifFalse:[
3290
76d4443744ed JavaClass memory optimization (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3289
diff changeset
  2525
        "/ Reading method for non-Java class
3110
2c747ca6078d [JavaClassReader optimization 2/3]: add methods at once instead of individually.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3106
diff changeset
  2526
        self error: 'Not really supported'.
2c747ca6078d [JavaClassReader optimization 2/3]: add methods at once instead of individually.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3106
diff changeset
  2527
357
90d866d87398 more st-class reading
cg
parents: 355
diff changeset
  2528
        m := Method new.
90d866d87398 more st-class reading
cg
parents: 355
diff changeset
  2529
        self readAttributesFor:m.
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  2530
        (access_flags bitTest:ACC_STATIC) ifTrue:[
3110
2c747ca6078d [JavaClassReader optimization 2/3]: add methods at once instead of individually.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3106
diff changeset
  2531
            self addSelector:name asSymbol withMethod:m toClass: aJavaClass class.
357
90d866d87398 more st-class reading
cg
parents: 355
diff changeset
  2532
        ] ifFalse:[
3110
2c747ca6078d [JavaClassReader optimization 2/3]: add methods at once instead of individually.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3106
diff changeset
  2533
            self addSelector:name asSymbol withMethod:m toClass: aJavaClass.
357
90d866d87398 more st-class reading
cg
parents: 355
diff changeset
  2534
        ]
273
bcbea5ac4860 checkin from browser
cg
parents: 269
diff changeset
  2535
    ].
1
083530508d9c intitial checkin
cg
parents:
diff changeset
  2536
083530508d9c intitial checkin
cg
parents:
diff changeset
  2537
    "
083530508d9c intitial checkin
cg
parents:
diff changeset
  2538
     JavaClassReader readFile:'/phys/ibm3/hotjava/classes/browser/AddButton.class'
083530508d9c intitial checkin
cg
parents:
diff changeset
  2539
    "
083530508d9c intitial checkin
cg
parents:
diff changeset
  2540
3110
2c747ca6078d [JavaClassReader optimization 2/3]: add methods at once instead of individually.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3106
diff changeset
  2541
    "Created: / 21-05-2014 / 15:58:59 / Jan Vrany <jan.vrany@fit.cvut.cz>"
3384
98eb8443f4f4 Use new Logger API (use Logger severityXXX instead of symbols)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3324
diff changeset
  2542
    "Modified: / 02-03-2015 / 14:09:47 / Jan Vrany <jan.vrany@fit.cvut.cz>"
1
083530508d9c intitial checkin
cg
parents:
diff changeset
  2543
!
083530508d9c intitial checkin
cg
parents:
diff changeset
  2544
38
3f1b61722466 checkin from browser
cg
parents: 32
diff changeset
  2545
readMethodsFor:aJavaClass
3110
2c747ca6078d [JavaClassReader optimization 2/3]: add methods at once instead of individually.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3106
diff changeset
  2546
    | methodsCount methodDict |
1
083530508d9c intitial checkin
cg
parents:
diff changeset
  2547
083530508d9c intitial checkin
cg
parents:
diff changeset
  2548
    "/
083530508d9c intitial checkin
cg
parents:
diff changeset
  2549
    "/ get methods
083530508d9c intitial checkin
cg
parents:
diff changeset
  2550
    "/
128
acc4e8e77092 *** empty log message ***
cg
parents: 122
diff changeset
  2551
    methodsCount := inStream nextUnsignedShortMSB:msb.
61
ff1579eb825f showCr: -> showCR:
cg
parents: 60
diff changeset
  2552
    Verbose ifTrue:[Transcript show:'methodsCount = '; showCR:methodsCount].
3110
2c747ca6078d [JavaClassReader optimization 2/3]: add methods at once instead of individually.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3106
diff changeset
  2553
    methodDict := MethodDictionary new: methodsCount.
1
083530508d9c intitial checkin
cg
parents:
diff changeset
  2554
083530508d9c intitial checkin
cg
parents:
diff changeset
  2555
    1 to:methodsCount do:[:i |
348
10725e1a2aee more st-class reading
cg
parents: 344
diff changeset
  2556
        Verbose ifTrue:[Transcript show:'method: '; showCR:i].
3110
2c747ca6078d [JavaClassReader optimization 2/3]: add methods at once instead of individually.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3106
diff changeset
  2557
        self readMethodFor: aJavaClass into: methodDict.
1
083530508d9c intitial checkin
cg
parents:
diff changeset
  2558
    ].
3198
a4ddeef7c5e9 Class reading optimization [4/4]: defer cache flushing at class initialization time.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3195
diff changeset
  2559
    "/ Set method dictionary bit do noy yet flush caches. Caches are flushed
a4ddeef7c5e9 Class reading optimization [4/4]: defer cache flushing at class initialization time.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3195
diff changeset
  2560
    "/ at the very last moment, when a class is actually initialized. This should
a4ddeef7c5e9 Class reading optimization [4/4]: defer cache flushing at class initialization time.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3195
diff changeset
  2561
    "/ be sufficent as an object cannot be sent a message unless a class is
a4ddeef7c5e9 Class reading optimization [4/4]: defer cache flushing at class initialization time.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3195
diff changeset
  2562
    "/ initialized first. This saves us a little bit of time when reading classes
a4ddeef7c5e9 Class reading optimization [4/4]: defer cache flushing at class initialization time.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3195
diff changeset
  2563
    "/ but cost time when initializing the class, so normally this is not much
a4ddeef7c5e9 Class reading optimization [4/4]: defer cache flushing at class initialization time.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3195
diff changeset
  2564
    "/ of a saving. However, this helps in cases Java class is only read into memory
a4ddeef7c5e9 Class reading optimization [4/4]: defer cache flushing at class initialization time.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3195
diff changeset
  2565
    "/ and never initialized - that's what JBrowser Workspace does.
a4ddeef7c5e9 Class reading optimization [4/4]: defer cache flushing at class initialization time.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3195
diff changeset
  2566
    "/ See JavaClass>>classInit.
a4ddeef7c5e9 Class reading optimization [4/4]: defer cache flushing at class initialization time.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3195
diff changeset
  2567
    aJavaClass setMethodDictionary: methodDict.
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  2568
1
083530508d9c intitial checkin
cg
parents:
diff changeset
  2569
    "
083530508d9c intitial checkin
cg
parents:
diff changeset
  2570
     JavaClassReader readFile:'/phys/ibm3/hotjava/classes/browser/AddButton.class'
083530508d9c intitial checkin
cg
parents:
diff changeset
  2571
    "
083530508d9c intitial checkin
cg
parents:
diff changeset
  2572
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  2573
    "Created: / 15-04-1996 / 16:46:30 / cg"
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  2574
    "Modified: / 08-05-1998 / 21:20:59 / cg"
3198
a4ddeef7c5e9 Class reading optimization [4/4]: defer cache flushing at class initialization time.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3195
diff changeset
  2575
    "Modified (comment): / 04-08-2014 / 17:04:08 / Jan Vrany <jan.vrany@fit.cvut.cz>"
1
083530508d9c intitial checkin
cg
parents:
diff changeset
  2576
! !
083530508d9c intitial checkin
cg
parents:
diff changeset
  2577
344
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  2578
!JavaClassReader methodsFor:'file reading - methods-ST'!
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  2579
348
10725e1a2aee more st-class reading
cg
parents: 344
diff changeset
  2580
readSTCodeAttributeFor:aSmalltalkMethod
10725e1a2aee more st-class reading
cg
parents: 344
diff changeset
  2581
    |attribute_length max_stack max_locals code_length code
10725e1a2aee more st-class reading
cg
parents: 344
diff changeset
  2582
     exception_table_length unknown1 unknown2|
10725e1a2aee more st-class reading
cg
parents: 344
diff changeset
  2583
10725e1a2aee more st-class reading
cg
parents: 344
diff changeset
  2584
    attribute_length := inStream nextUnsignedLongMSB:msb.
10725e1a2aee more st-class reading
cg
parents: 344
diff changeset
  2585
10725e1a2aee more st-class reading
cg
parents: 344
diff changeset
  2586
    Verbose ifTrue:[Transcript show:'attribute_length: 0x'; showCR:(attribute_length printStringRadix:16)].
10725e1a2aee more st-class reading
cg
parents: 344
diff changeset
  2587
10725e1a2aee more st-class reading
cg
parents: 344
diff changeset
  2588
    max_stack := inStream nextUnsignedShortMSB:msb.
10725e1a2aee more st-class reading
cg
parents: 344
diff changeset
  2589
    max_locals := inStream nextUnsignedShortMSB:msb.
10725e1a2aee more st-class reading
cg
parents: 344
diff changeset
  2590
10725e1a2aee more st-class reading
cg
parents: 344
diff changeset
  2591
    code_length := inStream nextUnsignedLongMSB:msb.
10725e1a2aee more st-class reading
cg
parents: 344
diff changeset
  2592
    Verbose ifTrue:[Transcript show:'code_length: '; showCR:(code_length printStringRadix:16)].
10725e1a2aee more st-class reading
cg
parents: 344
diff changeset
  2593
    Verbose ifTrue:[Transcript show:'code at pos: '; showCR:inStream position].
10725e1a2aee more st-class reading
cg
parents: 344
diff changeset
  2594
357
90d866d87398 more st-class reading
cg
parents: 355
diff changeset
  2595
    code_length ~~ 0 ifTrue:[
90d866d87398 more st-class reading
cg
parents: 355
diff changeset
  2596
        code := ByteArray new:code_length.
90d866d87398 more st-class reading
cg
parents: 355
diff changeset
  2597
        inStream nextBytes:code_length into:code startingAt:1.
90d866d87398 more st-class reading
cg
parents: 355
diff changeset
  2598
    ].
90d866d87398 more st-class reading
cg
parents: 355
diff changeset
  2599
    Verbose ifTrue:[Transcript show:'method code: '; showCR:code.].
348
10725e1a2aee more st-class reading
cg
parents: 344
diff changeset
  2600
10725e1a2aee more st-class reading
cg
parents: 344
diff changeset
  2601
    exception_table_length := inStream nextUnsignedShortMSB:msb.
10725e1a2aee more st-class reading
cg
parents: 344
diff changeset
  2602
    Verbose ifTrue:[Transcript show:'exception_table_length: '; showCR:(exception_table_length printStringRadix:16)].
10725e1a2aee more st-class reading
cg
parents: 344
diff changeset
  2603
    exception_table_length ~~ 0 ifTrue:[
10725e1a2aee more st-class reading
cg
parents: 344
diff changeset
  2604
        self error:'unexpected exceptionTable length'.
10725e1a2aee more st-class reading
cg
parents: 344
diff changeset
  2605
        "/ skip it.
10725e1a2aee more st-class reading
cg
parents: 344
diff changeset
  2606
        1 to:exception_table_length do:[:i |
10725e1a2aee more st-class reading
cg
parents: 344
diff changeset
  2607
            "start_pc :="   inStream nextUnsignedShortMSB:msb.
10725e1a2aee more st-class reading
cg
parents: 344
diff changeset
  2608
            "end_pc :="     inStream nextUnsignedShortMSB:msb.
10725e1a2aee more st-class reading
cg
parents: 344
diff changeset
  2609
            "handler_pc :=" inStream nextUnsignedShortMSB:msb.
10725e1a2aee more st-class reading
cg
parents: 344
diff changeset
  2610
            "catch_type :=" inStream nextUnsignedShortMSB:msb.
10725e1a2aee more st-class reading
cg
parents: 344
diff changeset
  2611
        ].
10725e1a2aee more st-class reading
cg
parents: 344
diff changeset
  2612
    ].
10725e1a2aee more st-class reading
cg
parents: 344
diff changeset
  2613
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  2614
    aSmalltalkMethod byteCode:code.
357
90d866d87398 more st-class reading
cg
parents: 355
diff changeset
  2615
    aSmalltalkMethod stackSize:max_stack .
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  2616
    aSmalltalkMethod numberOfVars:max_locals.
348
10725e1a2aee more st-class reading
cg
parents: 344
diff changeset
  2617
10725e1a2aee more st-class reading
cg
parents: 344
diff changeset
  2618
    self readAttributesFor:aSmalltalkMethod.
10725e1a2aee more st-class reading
cg
parents: 344
diff changeset
  2619
    ^ true
10725e1a2aee more st-class reading
cg
parents: 344
diff changeset
  2620
357
90d866d87398 more st-class reading
cg
parents: 355
diff changeset
  2621
    "Modified: / 16.5.1998 / 01:39:30 / cg"
348
10725e1a2aee more st-class reading
cg
parents: 344
diff changeset
  2622
!
10725e1a2aee more st-class reading
cg
parents: 344
diff changeset
  2623
344
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  2624
readSTLiteralsAttributeFor:aSmalltalkMethod
348
10725e1a2aee more st-class reading
cg
parents: 344
diff changeset
  2625
    |attribute_length literal_table_length literal_table litIndex literal|
10725e1a2aee more st-class reading
cg
parents: 344
diff changeset
  2626
10725e1a2aee more st-class reading
cg
parents: 344
diff changeset
  2627
    attribute_length := inStream nextUnsignedLongMSB:msb.
10725e1a2aee more st-class reading
cg
parents: 344
diff changeset
  2628
10725e1a2aee more st-class reading
cg
parents: 344
diff changeset
  2629
    literal_table_length := inStream nextUnsignedShortMSB:msb.
10725e1a2aee more st-class reading
cg
parents: 344
diff changeset
  2630
    literal_table_length ~~ 0 ifTrue:[
10725e1a2aee more st-class reading
cg
parents: 344
diff changeset
  2631
        literal_table := Array new:literal_table_length.
10725e1a2aee more st-class reading
cg
parents: 344
diff changeset
  2632
        1 to:literal_table_length do:[:i |
10725e1a2aee more st-class reading
cg
parents: 344
diff changeset
  2633
            litIndex := inStream nextUnsignedShortMSB:msb.
3291
2cf782f380f2 JavaClass memory optimization (part 2)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3290
diff changeset
  2634
            literal := (self constantPoolAt:litIndex).
348
10725e1a2aee more st-class reading
cg
parents: 344
diff changeset
  2635
            literal_table at:i put:literal.
10725e1a2aee more st-class reading
cg
parents: 344
diff changeset
  2636
        ].
10725e1a2aee more st-class reading
cg
parents: 344
diff changeset
  2637
    ].
357
90d866d87398 more st-class reading
cg
parents: 355
diff changeset
  2638
    Verbose ifTrue:[Transcript show:'literals: '; showCR:literal_table storeString.].
344
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  2639
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  2640
    "Created: / 7.5.1998 / 11:52:28 / cg"
357
90d866d87398 more st-class reading
cg
parents: 355
diff changeset
  2641
    "Modified: / 16.5.1998 / 01:52:27 / cg"
90d866d87398 more st-class reading
cg
parents: 355
diff changeset
  2642
!
90d866d87398 more st-class reading
cg
parents: 355
diff changeset
  2643
90d866d87398 more st-class reading
cg
parents: 355
diff changeset
  2644
readSTMethodCategoryAttributeFor:aSmalltalkMethod
90d866d87398 more st-class reading
cg
parents: 355
diff changeset
  2645
    |attribute_length name_index name|
90d866d87398 more st-class reading
cg
parents: 355
diff changeset
  2646
90d866d87398 more st-class reading
cg
parents: 355
diff changeset
  2647
    attribute_length := inStream nextUnsignedLongMSB:msb.
90d866d87398 more st-class reading
cg
parents: 355
diff changeset
  2648
90d866d87398 more st-class reading
cg
parents: 355
diff changeset
  2649
    name_index := inStream nextUnsignedShortMSB:msb.
3291
2cf782f380f2 JavaClass memory optimization (part 2)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3290
diff changeset
  2650
    name := (self constantPoolAt:name_index).
357
90d866d87398 more st-class reading
cg
parents: 355
diff changeset
  2651
90d866d87398 more st-class reading
cg
parents: 355
diff changeset
  2652
    aSmalltalkMethod category:name.
90d866d87398 more st-class reading
cg
parents: 355
diff changeset
  2653
348
10725e1a2aee more st-class reading
cg
parents: 344
diff changeset
  2654
    "Modified: / 8.5.1998 / 20:39:59 / cg"
357
90d866d87398 more st-class reading
cg
parents: 355
diff changeset
  2655
    "Created: / 16.5.1998 / 01:04:19 / cg"
344
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  2656
! !
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  2657
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  2658
!JavaClassReader methodsFor:'helpers'!
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  2659
2428
392a2eba9c42 Cherry-picked JavaClassReader from rev 8762fc7137c6.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2396
diff changeset
  2660
addSelector: selector withMethod: method toClass: javaClass
392a2eba9c42 Cherry-picked JavaClassReader from rev 8762fc7137c6.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2396
diff changeset
  2661
    "Basically a primAddSelector:withMethod:. This indirection
392a2eba9c42 Cherry-picked JavaClassReader from rev 8762fc7137c6.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2396
diff changeset
  2662
     is required by Expecco (it uses custom class reader so
392a2eba9c42 Cherry-picked JavaClassReader from rev 8762fc7137c6.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2396
diff changeset
  2663
     which overrides this method"
392a2eba9c42 Cherry-picked JavaClassReader from rev 8762fc7137c6.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2396
diff changeset
  2664
392a2eba9c42 Cherry-picked JavaClassReader from rev 8762fc7137c6.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2396
diff changeset
  2665
    javaClass primAddSelector:selector withMethod: method
392a2eba9c42 Cherry-picked JavaClassReader from rev 8762fc7137c6.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2396
diff changeset
  2666
392a2eba9c42 Cherry-picked JavaClassReader from rev 8762fc7137c6.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2396
diff changeset
  2667
    "Created: / 26-02-2013 / 11:42:15 / Jan Vrany <jan.vrany@fit.cvut.cz>"
392a2eba9c42 Cherry-picked JavaClassReader from rev 8762fc7137c6.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2396
diff changeset
  2668
!
392a2eba9c42 Cherry-picked JavaClassReader from rev 8762fc7137c6.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2396
diff changeset
  2669
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  2670
loadSuperclassIdentifiedBy: aJavaClassRef ignoring: classesBeingLoaded
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  2671
    "overriding method, here we expect something to be new JavaClassRef2"
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  2672
2841
6fa1bcf9c997 JavaClass>>#name vs. #binaryName refactoring
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2812
diff changeset
  2673
    self assert: aJavaClassRef isJavaRef
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  2674
        message: 'class identifier is not a java reference'.
2841
6fa1bcf9c997 JavaClass>>#name vs. #binaryName refactoring
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2812
diff changeset
  2675
    self assert: aJavaClassRef isJavaClassRef
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  2676
        message: 'class identifier is not a java class reference'.
2841
6fa1bcf9c997 JavaClass>>#name vs. #binaryName refactoring
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2812
diff changeset
  2677
    (classesBeingLoaded includes: aJavaClassRef name) ifTrue: [
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  2678
        self
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  2679
            error: 'class we want to load is being loaded and that means something went wrong. tell mh'
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  2680
    ].
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  2681
     "hint in case of bug - is parent of something set? surely jv will know more :)" "find out which classloader is used"
2841
6fa1bcf9c997 JavaClass>>#name vs. #binaryName refactoring
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2812
diff changeset
  2682
    ^ JavaVM classForName: aJavaClassRef name definedBy: classLoader.
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  2683
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  2684
    "Created: / 18-05-2011 / 14:55:32 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
2841
6fa1bcf9c997 JavaClass>>#name vs. #binaryName refactoring
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2812
diff changeset
  2685
    "Modified: / 08-10-2013 / 22:57:54 / Jan Vrany <jan.vrany@fit.cvut.cz>"
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  2686
!
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  2687
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  2688
updateOwnerInCPItem: each
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  2689
    ((each isJavaRef and: [ each isNewJavaRef ])
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  2690
        or: [ each isJavaNameAndType and: [ each isNewJavaNameAndType ] ])
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  2691
            ifTrue: [ each owner: classBeingLoaded ].
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  2692
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  2693
    "Created: / 12-05-2011 / 17:40:46 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  2694
!
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  2695
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  2696
updateOwnerInField: each
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  2697
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  2698
            each setClass: classBeingLoaded.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  2699
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  2700
    "Created: / 18-05-2011 / 13:57:20 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  2701
! !
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  2702
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  2703
!JavaClassReader methodsFor:'logging'!
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  2704
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  2705
info: message
3384
98eb8443f4f4 Use new Logger API (use Logger severityXXX instead of symbols)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3324
diff changeset
  2706
    Verbose ifTrue: [ Logger log: message severity: Logger severityINFO facility: 'JVM' ].
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  2707
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  2708
    "Created: / 18-05-2011 / 15:06:06 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
3384
98eb8443f4f4 Use new Logger API (use Logger severityXXX instead of symbols)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3324
diff changeset
  2709
    "Modified: / 02-03-2015 / 14:10:35 / Jan Vrany <jan.vrany@fit.cvut.cz>"
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  2710
! !
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  2711
135
098936234135 *** empty log message ***
cg
parents: 128
diff changeset
  2712
!JavaClassReader class methodsFor:'documentation'!
1
083530508d9c intitial checkin
cg
parents:
diff changeset
  2713
083530508d9c intitial checkin
cg
parents:
diff changeset
  2714
version
3431
82790b1e6d54 Merged with mercurial revision 4f3cc813be4 (8 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3430
diff changeset
  2715
    ^ '$Header: /cvs/stx/stx/libjava/JavaClassReader.st,v 1.101 2015-03-20 12:07:59 vrany Exp $'
2148
b51eb5830f48 added:11 methods
Claus Gittinger <cg@exept.de>
parents: 2142
diff changeset
  2716
!
b51eb5830f48 added:11 methods
Claus Gittinger <cg@exept.de>
parents: 2142
diff changeset
  2717
b51eb5830f48 added:11 methods
Claus Gittinger <cg@exept.de>
parents: 2142
diff changeset
  2718
version_CVS
3431
82790b1e6d54 Merged with mercurial revision 4f3cc813be4 (8 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3430
diff changeset
  2719
    ^ '$Header: /cvs/stx/stx/libjava/JavaClassReader.st,v 1.101 2015-03-20 12:07:59 vrany Exp $'
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  2720
!
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  2721
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  2722
version_SVN
3288
90f0566d8145 Extracted readMagic to alow lazy loading of constant pool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 3279
diff changeset
  2723
    ^ 'Id'
1
083530508d9c intitial checkin
cg
parents:
diff changeset
  2724
! !
2108
ca8c4e7db2e8 category change
Claus Gittinger <cg@exept.de>
parents: 2089
diff changeset
  2725
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  2726
2089
f90b44f9c9e0 utf8 string decoding
Claus Gittinger <cg@exept.de>
parents: 749
diff changeset
  2727
JavaClassReader initialize!