author | phh |
Sat, 30 Nov 2019 14:33:05 -0800 | |
changeset 59330 | 5b96c12f909d |
parent 53178 | 818b7bf2af49 |
permissions | -rw-r--r-- |
32641
ac2c73b45253
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
diff
changeset
|
1 |
/* |
53178
818b7bf2af49
8215123: Crash in runtime image built with jlink --compress=2
aivanov
parents:
50604
diff
changeset
|
2 |
* Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved. |
35784 | 3 |
* |
4 |
* Redistribution and use in source and binary forms, with or without |
|
5 |
* modification, are permitted provided that the following conditions |
|
6 |
* are met: |
|
32641
ac2c73b45253
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
diff
changeset
|
7 |
* |
35784 | 8 |
* - Redistributions of source code must retain the above copyright |
9 |
* notice, this list of conditions and the following disclaimer. |
|
10 |
* |
|
11 |
* - Redistributions in binary form must reproduce the above copyright |
|
12 |
* notice, this list of conditions and the following disclaimer in the |
|
13 |
* documentation and/or other materials provided with the distribution. |
|
32641
ac2c73b45253
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
diff
changeset
|
14 |
* |
35784 | 15 |
* - Neither the name of Oracle nor the names of its |
16 |
* contributors may be used to endorse or promote products derived |
|
17 |
* from this software without specific prior written permission. |
|
32641
ac2c73b45253
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
diff
changeset
|
18 |
* |
35784 | 19 |
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS |
20 |
* IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, |
|
21 |
* THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR |
|
22 |
* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR |
|
23 |
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, |
|
24 |
* EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, |
|
25 |
* PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR |
|
26 |
* PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF |
|
27 |
* LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING |
|
28 |
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS |
|
29 |
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
|
32641
ac2c73b45253
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
diff
changeset
|
30 |
*/ |
ac2c73b45253
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
diff
changeset
|
31 |
|
ac2c73b45253
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
diff
changeset
|
32 |
#include "jni.h" |
ac2c73b45253
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
diff
changeset
|
33 |
#include "imageDecompressor.hpp" |
ac2c73b45253
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
diff
changeset
|
34 |
#include "endian.hpp" |
ac2c73b45253
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
diff
changeset
|
35 |
#ifdef WIN32 |
ac2c73b45253
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
diff
changeset
|
36 |
#include <windows.h> |
ac2c73b45253
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
diff
changeset
|
37 |
#else |
ac2c73b45253
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
diff
changeset
|
38 |
#include <dlfcn.h> |
ac2c73b45253
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
diff
changeset
|
39 |
#endif |
ac2c73b45253
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
diff
changeset
|
40 |
|
53178
818b7bf2af49
8215123: Crash in runtime image built with jlink --compress=2
aivanov
parents:
50604
diff
changeset
|
41 |
typedef jboolean (*ZipInflateFully_t)(void *inBuf, jlong inLen, |
818b7bf2af49
8215123: Crash in runtime image built with jlink --compress=2
aivanov
parents:
50604
diff
changeset
|
42 |
void *outBuf, jlong outLen, char **pmsg); |
32757
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
43 |
static ZipInflateFully_t ZipInflateFully = NULL; |
32641
ac2c73b45253
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
diff
changeset
|
44 |
|
ac2c73b45253
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
diff
changeset
|
45 |
#ifndef WIN32 |
32757
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
46 |
#define JNI_LIB_PREFIX "lib" |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
47 |
#ifdef __APPLE__ |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
48 |
#define JNI_LIB_SUFFIX ".dylib" |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
49 |
#else |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
50 |
#define JNI_LIB_SUFFIX ".so" |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
51 |
#endif |
32641
ac2c73b45253
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
diff
changeset
|
52 |
#endif |
ac2c73b45253
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
diff
changeset
|
53 |
|
ac2c73b45253
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
diff
changeset
|
54 |
/** |
ac2c73b45253
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
diff
changeset
|
55 |
* Return the address of the entry point named in the zip shared library. |
ac2c73b45253
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
diff
changeset
|
56 |
* @param name - the name of the entry point |
ac2c73b45253
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
diff
changeset
|
57 |
* @return the address of the entry point or NULL |
ac2c73b45253
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
diff
changeset
|
58 |
*/ |
ac2c73b45253
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
diff
changeset
|
59 |
static void* findEntry(const char* name) { |
32757
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
60 |
void *addr = NULL; |
32641
ac2c73b45253
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
diff
changeset
|
61 |
#ifdef WIN32 |
32757
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
62 |
HMODULE handle = GetModuleHandle("zip.dll"); |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
63 |
if (handle == NULL) { |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
64 |
return NULL; |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
65 |
} |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
66 |
addr = (void*) GetProcAddress(handle, name); |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
67 |
return addr; |
32641
ac2c73b45253
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
diff
changeset
|
68 |
#else |
32757
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
69 |
addr = dlopen(JNI_LIB_PREFIX "zip" JNI_LIB_SUFFIX, RTLD_GLOBAL|RTLD_LAZY); |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
70 |
if (addr == NULL) { |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
71 |
return NULL; |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
72 |
} |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
73 |
addr = dlsym(addr, name); |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
74 |
return addr; |
32641
ac2c73b45253
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
diff
changeset
|
75 |
#endif |
ac2c73b45253
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
diff
changeset
|
76 |
} |
ac2c73b45253
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
diff
changeset
|
77 |
|
ac2c73b45253
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
diff
changeset
|
78 |
/* |
ac2c73b45253
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
diff
changeset
|
79 |
* Initialize the array of decompressors. |
ac2c73b45253
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
diff
changeset
|
80 |
*/ |
ac2c73b45253
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
diff
changeset
|
81 |
int ImageDecompressor::_decompressors_num = 0; |
ac2c73b45253
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
diff
changeset
|
82 |
ImageDecompressor** ImageDecompressor::_decompressors = NULL; |
ac2c73b45253
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
diff
changeset
|
83 |
void ImageDecompressor::image_decompressor_init() { |
32757
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
84 |
if (_decompressors == NULL) { |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
85 |
ZipInflateFully = (ZipInflateFully_t) findEntry("ZIP_InflateFully"); |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
86 |
assert(ZipInflateFully != NULL && "ZIP decompressor not found."); |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
87 |
_decompressors_num = 2; |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
88 |
_decompressors = new ImageDecompressor*[_decompressors_num]; |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
89 |
_decompressors[0] = new ZipDecompressor("zip"); |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
90 |
_decompressors[1] = new SharedStringDecompressor("compact-cp"); |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
91 |
} |
32641
ac2c73b45253
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
diff
changeset
|
92 |
} |
ac2c73b45253
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
diff
changeset
|
93 |
|
ac2c73b45253
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
diff
changeset
|
94 |
void ImageDecompressor::image_decompressor_close() { |
35698
409a5492076d
8146249: libjimage should use delete[] with new[]
asmotrak
parents:
32757
diff
changeset
|
95 |
delete[] _decompressors; |
32641
ac2c73b45253
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
diff
changeset
|
96 |
} |
ac2c73b45253
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
diff
changeset
|
97 |
|
ac2c73b45253
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
diff
changeset
|
98 |
/* |
ac2c73b45253
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
diff
changeset
|
99 |
* Locate decompressor. |
ac2c73b45253
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
diff
changeset
|
100 |
*/ |
ac2c73b45253
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
diff
changeset
|
101 |
ImageDecompressor* ImageDecompressor::get_decompressor(const char * decompressor_name) { |
32757
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
102 |
image_decompressor_init(); |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
103 |
for (int i = 0; i < _decompressors_num; i++) { |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
104 |
ImageDecompressor* decompressor = _decompressors[i]; |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
105 |
assert(decompressor != NULL && "Decompressors not initialized."); |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
106 |
if (strcmp(decompressor->get_name(), decompressor_name) == 0) { |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
107 |
return decompressor; |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
108 |
} |
32641
ac2c73b45253
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
diff
changeset
|
109 |
} |
32757
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
110 |
assert(false && "No decompressor found."); |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
111 |
return NULL; |
32641
ac2c73b45253
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
diff
changeset
|
112 |
} |
ac2c73b45253
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
diff
changeset
|
113 |
|
36511 | 114 |
// Sparc to read unaligned content |
115 |
// u8 l = (*(u8*) ptr); |
|
116 |
// If ptr is not aligned, sparc will fail. |
|
117 |
u8 ImageDecompressor::getU8(u1* ptr, Endian *endian) { |
|
118 |
u8 ret; |
|
119 |
if (endian->is_big_endian()) { |
|
120 |
ret = (u8)ptr[0] << 56 | (u8)ptr[1] << 48 | (u8)ptr[2]<<40 | (u8)ptr[3]<<32 | |
|
121 |
ptr[4]<<24 | ptr[5]<<16 | ptr[6]<<8 | ptr[7]; |
|
122 |
} else { |
|
123 |
ret = ptr[0] | ptr[1]<<8 | ptr[2]<<16 | ptr[3]<<24 | (u8)ptr[4]<<32 | |
|
124 |
(u8)ptr[5]<<40 | (u8)ptr[6]<<48 | (u8)ptr[7]<<56; |
|
125 |
} |
|
126 |
return ret; |
|
127 |
} |
|
128 |
||
129 |
u4 ImageDecompressor::getU4(u1* ptr, Endian *endian) { |
|
130 |
u4 ret; |
|
131 |
if (endian->is_big_endian()) { |
|
132 |
ret = ptr[0] << 24 | ptr[1]<<16 | (ptr[2]<<8) | ptr[3]; |
|
133 |
} else { |
|
134 |
ret = ptr[0] | ptr[1]<<8 | (ptr[2]<<16) | ptr[3]<<24; |
|
135 |
} |
|
136 |
return ret; |
|
137 |
} |
|
138 |
||
32641
ac2c73b45253
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
diff
changeset
|
139 |
/* |
ac2c73b45253
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
diff
changeset
|
140 |
* Decompression entry point. Called from ImageFileReader::get_resource. |
ac2c73b45253
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
diff
changeset
|
141 |
*/ |
ac2c73b45253
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
diff
changeset
|
142 |
void ImageDecompressor::decompress_resource(u1* compressed, u1* uncompressed, |
36511 | 143 |
u8 uncompressed_size, const ImageStrings* strings, Endian *endian) { |
32757
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
144 |
bool has_header = false; |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
145 |
u1* decompressed_resource = compressed; |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
146 |
u1* compressed_resource = compressed; |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
147 |
// Resource could have been transformed by a stack of decompressors. |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
148 |
// Iterate and decompress resources until there is no more header. |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
149 |
do { |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
150 |
ResourceHeader _header; |
36511 | 151 |
u1* compressed_resource_base = compressed_resource; |
152 |
_header._magic = getU4(compressed_resource, endian); |
|
153 |
compressed_resource += 4; |
|
154 |
_header._size = getU8(compressed_resource, endian); |
|
155 |
compressed_resource += 8; |
|
156 |
_header._uncompressed_size = getU8(compressed_resource, endian); |
|
157 |
compressed_resource += 8; |
|
158 |
_header._decompressor_name_offset = getU4(compressed_resource, endian); |
|
159 |
compressed_resource += 4; |
|
160 |
_header._decompressor_config_offset = getU4(compressed_resource, endian); |
|
161 |
compressed_resource += 4; |
|
162 |
_header._is_terminal = *compressed_resource; |
|
163 |
compressed_resource += 1; |
|
32757
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
164 |
has_header = _header._magic == ResourceHeader::resource_header_magic; |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
165 |
if (has_header) { |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
166 |
// decompressed_resource array contains the result of decompression |
36511 | 167 |
decompressed_resource = new u1[(size_t) _header._uncompressed_size]; |
32757
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
168 |
// Retrieve the decompressor name |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
169 |
const char* decompressor_name = strings->get(_header._decompressor_name_offset); |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
170 |
assert(decompressor_name && "image decompressor not found"); |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
171 |
// Retrieve the decompressor instance |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
172 |
ImageDecompressor* decompressor = get_decompressor(decompressor_name); |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
173 |
assert(decompressor && "image decompressor not found"); |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
174 |
// Ask the decompressor to decompress the compressed content |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
175 |
decompressor->decompress_resource(compressed_resource, decompressed_resource, |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
176 |
&_header, strings); |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
177 |
if (compressed_resource_base != compressed) { |
35698
409a5492076d
8146249: libjimage should use delete[] with new[]
asmotrak
parents:
32757
diff
changeset
|
178 |
delete[] compressed_resource_base; |
32757
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
179 |
} |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
180 |
compressed_resource = decompressed_resource; |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
181 |
} |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
182 |
} while (has_header); |
36511 | 183 |
memcpy(uncompressed, decompressed_resource, (size_t) uncompressed_size); |
42687
7a5929518e6a
8170663: Fix minor issues in corelib and servicabilty coding.
goetz
parents:
36511
diff
changeset
|
184 |
delete[] decompressed_resource; |
32641
ac2c73b45253
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
diff
changeset
|
185 |
} |
ac2c73b45253
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
diff
changeset
|
186 |
|
ac2c73b45253
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
diff
changeset
|
187 |
// Zip decompressor |
ac2c73b45253
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
diff
changeset
|
188 |
|
ac2c73b45253
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
diff
changeset
|
189 |
void ZipDecompressor::decompress_resource(u1* data, u1* uncompressed, |
32757
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
190 |
ResourceHeader* header, const ImageStrings* strings) { |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
191 |
char* msg = NULL; |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
192 |
jboolean res = ZipDecompressor::decompress(data, header->_size, uncompressed, |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
193 |
header->_uncompressed_size, &msg); |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
194 |
assert(res && "decompression failed"); |
32641
ac2c73b45253
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
diff
changeset
|
195 |
} |
ac2c73b45253
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
diff
changeset
|
196 |
|
ac2c73b45253
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
diff
changeset
|
197 |
jboolean ZipDecompressor::decompress(void *in, u8 inSize, void *out, u8 outSize, char **pmsg) { |
32757
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
198 |
return (*ZipInflateFully)(in, inSize, out, outSize, pmsg); |
32641
ac2c73b45253
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
diff
changeset
|
199 |
} |
ac2c73b45253
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
diff
changeset
|
200 |
|
ac2c73b45253
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
diff
changeset
|
201 |
// END Zip Decompressor |
ac2c73b45253
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
diff
changeset
|
202 |
|
ac2c73b45253
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
diff
changeset
|
203 |
// Shared String decompressor |
ac2c73b45253
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
diff
changeset
|
204 |
|
ac2c73b45253
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
diff
changeset
|
205 |
// array index is the constant pool tag. value is size. |
ac2c73b45253
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
diff
changeset
|
206 |
// eg: array[5] = 8; means size of long is 8 bytes. |
32757
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
207 |
const u1 SharedStringDecompressor::sizes[] = { |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
208 |
0, 0, 0, 4, 4, 8, 8, 2, 2, 4, 4, 4, 4, 0, 0, 3, 2, 0, 4 |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
209 |
}; |
32641
ac2c73b45253
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
diff
changeset
|
210 |
/** |
ac2c73b45253
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
diff
changeset
|
211 |
* Recreate the class by reconstructing the constant pool. |
ac2c73b45253
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
diff
changeset
|
212 |
*/ |
ac2c73b45253
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
diff
changeset
|
213 |
void SharedStringDecompressor::decompress_resource(u1* data, |
32757
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
214 |
u1* uncompressed_resource, |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
215 |
ResourceHeader* header, const ImageStrings* strings) { |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
216 |
u1* uncompressed_base = uncompressed_resource; |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
217 |
u1* data_base = data; |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
218 |
int header_size = 8; // magic + major + minor |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
219 |
memcpy(uncompressed_resource, data, header_size + 2); //+ cp count |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
220 |
uncompressed_resource += header_size + 2; |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
221 |
data += header_size; |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
222 |
u2 cp_count = Endian::get_java(data); |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
223 |
data += 2; |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
224 |
for (int i = 1; i < cp_count; i++) { |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
225 |
u1 tag = *data; |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
226 |
data += 1; |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
227 |
switch (tag) { |
32641
ac2c73b45253
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
diff
changeset
|
228 |
|
32757
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
229 |
case externalized_string: |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
230 |
{ // String in Strings table |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
231 |
*uncompressed_resource = 1; |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
232 |
uncompressed_resource += 1; |
35706 | 233 |
int k = decompress_int(data); |
234 |
const char * string = strings->get(k); |
|
32757
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
235 |
int str_length = (int) strlen(string); |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
236 |
Endian::set_java(uncompressed_resource, str_length); |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
237 |
uncompressed_resource += 2; |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
238 |
memcpy(uncompressed_resource, string, str_length); |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
239 |
uncompressed_resource += str_length; |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
240 |
break; |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
241 |
} |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
242 |
// Descriptor String has been split and types added to Strings table |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
243 |
case externalized_string_descriptor: |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
244 |
{ |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
245 |
*uncompressed_resource = 1; |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
246 |
uncompressed_resource += 1; |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
247 |
int descriptor_index = decompress_int(data); |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
248 |
int indexes_length = decompress_int(data); |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
249 |
u1* length_address = uncompressed_resource; |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
250 |
uncompressed_resource += 2; |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
251 |
int desc_length = 0; |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
252 |
const char * desc_string = strings->get(descriptor_index); |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
253 |
if (indexes_length > 0) { |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
254 |
u1* indexes_base = data; |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
255 |
data += indexes_length; |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
256 |
char c = *desc_string; |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
257 |
do { |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
258 |
*uncompressed_resource = c; |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
259 |
uncompressed_resource++; |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
260 |
desc_length += 1; |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
261 |
/* |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
262 |
* Every L character is the marker we are looking at in order |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
263 |
* to reconstruct the descriptor. Each time an L is found, then |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
264 |
* we retrieve the couple token/token at the current index and |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
265 |
* add it to the descriptor. |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
266 |
* "(L;I)V" and "java/lang","String" couple of tokens, |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
267 |
* this becomes "(Ljava/lang/String;I)V" |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
268 |
*/ |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
269 |
if (c == 'L') { |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
270 |
int index = decompress_int(indexes_base); |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
271 |
const char * pkg = strings->get(index); |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
272 |
int str_length = (int) strlen(pkg); |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
273 |
// the case where we have a package. |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
274 |
// reconstruct the type full name |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
275 |
if (str_length > 0) { |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
276 |
int len = str_length + 1; |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
277 |
char* fullpkg = new char[len]; |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
278 |
char* pkg_base = fullpkg; |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
279 |
memcpy(fullpkg, pkg, str_length); |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
280 |
fullpkg += str_length; |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
281 |
*fullpkg = '/'; |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
282 |
memcpy(uncompressed_resource, pkg_base, len); |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
283 |
uncompressed_resource += len; |
35698
409a5492076d
8146249: libjimage should use delete[] with new[]
asmotrak
parents:
32757
diff
changeset
|
284 |
delete[] pkg_base; |
32757
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
285 |
desc_length += len; |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
286 |
} else { // Empty package |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
287 |
// Nothing to do. |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
288 |
} |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
289 |
int classIndex = decompress_int(indexes_base); |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
290 |
const char * clazz = strings->get(classIndex); |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
291 |
int clazz_length = (int) strlen(clazz); |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
292 |
memcpy(uncompressed_resource, clazz, clazz_length); |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
293 |
uncompressed_resource += clazz_length; |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
294 |
desc_length += clazz_length; |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
295 |
} |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
296 |
desc_string += 1; |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
297 |
c = *desc_string; |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
298 |
} while (c != '\0'); |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
299 |
} else { |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
300 |
desc_length = (int) strlen(desc_string); |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
301 |
memcpy(uncompressed_resource, desc_string, desc_length); |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
302 |
uncompressed_resource += desc_length; |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
303 |
} |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
304 |
Endian::set_java(length_address, desc_length); |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
305 |
break; |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
306 |
} |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
307 |
|
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
308 |
case constant_utf8: |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
309 |
{ // UTF-8 |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
310 |
*uncompressed_resource = tag; |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
311 |
uncompressed_resource += 1; |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
312 |
u2 str_length = Endian::get_java(data); |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
313 |
int len = str_length + 2; |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
314 |
memcpy(uncompressed_resource, data, len); |
32641
ac2c73b45253
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
diff
changeset
|
315 |
uncompressed_resource += len; |
32757
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
316 |
data += len; |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
317 |
break; |
32641
ac2c73b45253
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
diff
changeset
|
318 |
} |
ac2c73b45253
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
diff
changeset
|
319 |
|
32757
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
320 |
case constant_long: |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
321 |
case constant_double: |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
322 |
{ |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
323 |
i++; |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
324 |
} |
50604 | 325 |
/* fall through */ |
32757
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
326 |
default: |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
327 |
{ |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
328 |
*uncompressed_resource = tag; |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
329 |
uncompressed_resource += 1; |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
330 |
int size = sizes[tag]; |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
331 |
memcpy(uncompressed_resource, data, size); |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
332 |
uncompressed_resource += size; |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
333 |
data += size; |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
334 |
} |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
335 |
} |
32641
ac2c73b45253
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
diff
changeset
|
336 |
} |
36511 | 337 |
u8 remain = header->_size - (int)(data - data_base); |
338 |
u8 computed = (u8)(uncompressed_resource - uncompressed_base) + remain; |
|
32757
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
339 |
if (header->_uncompressed_size != computed) |
36511 | 340 |
printf("Failure, expecting %llu but getting %llu\n", header->_uncompressed_size, |
32757
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
341 |
computed); |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
342 |
assert(header->_uncompressed_size == computed && |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
343 |
"Constant Pool reconstruction failed"); |
36511 | 344 |
memcpy(uncompressed_resource, data, (size_t) remain); |
32641
ac2c73b45253
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
diff
changeset
|
345 |
} |
ac2c73b45253
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
diff
changeset
|
346 |
|
ac2c73b45253
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
diff
changeset
|
347 |
/* |
ac2c73b45253
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
diff
changeset
|
348 |
* Decompress integers. Compressed integers are negative. |
ac2c73b45253
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
diff
changeset
|
349 |
* If positive, the integer is not decompressed. |
ac2c73b45253
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
diff
changeset
|
350 |
* If negative, length extracted from the first byte, then reconstruct the integer |
ac2c73b45253
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
diff
changeset
|
351 |
* from the following bytes. |
ac2c73b45253
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
diff
changeset
|
352 |
* Example of compression: 1 is compressed on 1 byte: 10100001 |
ac2c73b45253
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
diff
changeset
|
353 |
*/ |
ac2c73b45253
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
diff
changeset
|
354 |
int SharedStringDecompressor::decompress_int(unsigned char*& value) { |
32757
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
355 |
int len = 4; |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
356 |
int res = 0; |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
357 |
char b1 = *value; |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
358 |
if (is_compressed((signed char)b1)) { // compressed |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
359 |
len = get_compressed_length(b1); |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
360 |
char clearedValue = b1 &= 0x1F; |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
361 |
if (len == 1) { |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
362 |
res = clearedValue; |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
363 |
} else { |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
364 |
res = (clearedValue & 0xFF) << 8 * (len - 1); |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
365 |
for (int i = 1; i < len; i++) { |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
366 |
res |= (value[i]&0xFF) << 8 * (len - i - 1); |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
367 |
} |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
368 |
} |
32641
ac2c73b45253
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
diff
changeset
|
369 |
} else { |
32757
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
370 |
res = (value[0] & 0xFF) << 24 | (value[1]&0xFF) << 16 | |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
371 |
(value[2]&0xFF) << 8 | (value[3]&0xFF); |
32641
ac2c73b45253
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
diff
changeset
|
372 |
} |
32757
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
373 |
value += len; |
79d34d4b9627
8135197: libjimage code needs translation from hotspot-ish to jdk-ish
jlaskey
parents:
32641
diff
changeset
|
374 |
return res; |
32641
ac2c73b45253
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
diff
changeset
|
375 |
} |
ac2c73b45253
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
diff
changeset
|
376 |
// END Shared String decompressor |