Merge
This commit is contained in:
commit
26faf043d2
@ -1,5 +1,5 @@
|
|||||||
#
|
#
|
||||||
# Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
|
# Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
|
||||||
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||||
#
|
#
|
||||||
# This code is free software; you can redistribute it and/or modify it
|
# This code is free software; you can redistribute it and/or modify it
|
||||||
@ -111,10 +111,10 @@ CC_OPT = $(CC_OPT/$(OPTIMIZATION_LEVEL))
|
|||||||
|
|
||||||
# For all platforms, do not omit the frame pointer register usage.
|
# For all platforms, do not omit the frame pointer register usage.
|
||||||
# We need this frame pointer to make it easy to walk the stacks.
|
# We need this frame pointer to make it easy to walk the stacks.
|
||||||
# This should be the default on X86, but ia64 and amd64 may not have this
|
# This should be the default on X86, but ia64, and x86_64
|
||||||
# as the default.
|
# may not have this as the default.
|
||||||
CFLAGS_REQUIRED_amd64 += -m64 -fno-omit-frame-pointer -D_LITTLE_ENDIAN
|
CFLAGS_REQUIRED_x86_64 += -m64 -fno-omit-frame-pointer -D_LITTLE_ENDIAN
|
||||||
LDFLAGS_COMMON_amd64 += -m64
|
LDFLAGS_COMMON_x86_64 += -m64
|
||||||
CFLAGS_REQUIRED_i586 += -m32 -fno-omit-frame-pointer -D_LITTLE_ENDIAN
|
CFLAGS_REQUIRED_i586 += -m32 -fno-omit-frame-pointer -D_LITTLE_ENDIAN
|
||||||
LDFLAGS_COMMON_i586 += -m32
|
LDFLAGS_COMMON_i586 += -m32
|
||||||
CFLAGS_REQUIRED_ia64 += -m64 -fno-omit-frame-pointer -D_LITTLE_ENDIAN
|
CFLAGS_REQUIRED_ia64 += -m64 -fno-omit-frame-pointer -D_LITTLE_ENDIAN
|
||||||
@ -168,7 +168,7 @@ PIC_CODE_LARGE = -fPIC
|
|||||||
PIC_CODE_SMALL = -fpic
|
PIC_CODE_SMALL = -fpic
|
||||||
GLOBAL_KPIC = $(PIC_CODE_LARGE)
|
GLOBAL_KPIC = $(PIC_CODE_LARGE)
|
||||||
CFLAGS_COMMON += $(GLOBAL_KPIC) $(GCC_WARNINGS)
|
CFLAGS_COMMON += $(GLOBAL_KPIC) $(GCC_WARNINGS)
|
||||||
ifeq ($(ARCH), amd64)
|
ifeq ($(ARCH), x86_64)
|
||||||
CFLAGS_COMMON += -pipe
|
CFLAGS_COMMON += -pipe
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
#
|
#
|
||||||
# Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
|
# Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
|
||||||
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||||
#
|
#
|
||||||
# This code is free software; you can redistribute it and/or modify it
|
# This code is free software; you can redistribute it and/or modify it
|
||||||
@ -264,7 +264,7 @@ ifeq ($(PLATFORM), macosx)
|
|||||||
echo sparc \
|
echo sparc \
|
||||||
;; \
|
;; \
|
||||||
x86_64) \
|
x86_64) \
|
||||||
echo amd64 \
|
echo x86_64 \
|
||||||
;; \
|
;; \
|
||||||
universal) \
|
universal) \
|
||||||
echo universal \
|
echo universal \
|
||||||
|
@ -81,6 +81,7 @@ endif
|
|||||||
# SA tools
|
# SA tools
|
||||||
ifeq ($(PROGRAM),jstack)
|
ifeq ($(PROGRAM),jstack)
|
||||||
SA_TOOL=true
|
SA_TOOL=true
|
||||||
|
INFO_PLIST_FILE=Info-privileged.plist
|
||||||
endif
|
endif
|
||||||
ifeq ($(PROGRAM),jsadebugd)
|
ifeq ($(PROGRAM),jsadebugd)
|
||||||
SA_TOOL=true
|
SA_TOOL=true
|
||||||
|
@ -27,7 +27,6 @@ package apple.launcher;
|
|||||||
|
|
||||||
import java.io.*;
|
import java.io.*;
|
||||||
import java.lang.reflect.*;
|
import java.lang.reflect.*;
|
||||||
import java.security.PrivilegedAction;
|
|
||||||
import java.text.MessageFormat;
|
import java.text.MessageFormat;
|
||||||
import java.util.*;
|
import java.util.*;
|
||||||
import java.util.jar.*;
|
import java.util.jar.*;
|
||||||
@ -36,7 +35,13 @@ import javax.swing.*;
|
|||||||
|
|
||||||
class JavaAppLauncher implements Runnable {
|
class JavaAppLauncher implements Runnable {
|
||||||
static {
|
static {
|
||||||
java.security.AccessController.doPrivileged((PrivilegedAction<?>)new sun.security.action.LoadLibraryAction("osx"));
|
java.security.AccessController.doPrivileged(
|
||||||
|
new java.security.PrivilegedAction<Void>() {
|
||||||
|
public Void run() {
|
||||||
|
System.loadLibrary("osx");
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
private static native <T> T nativeConvertAndRelease(final long ptr);
|
private static native <T> T nativeConvertAndRelease(final long ptr);
|
||||||
|
@ -103,7 +103,13 @@ public final class KeychainStore extends KeyStoreSpi {
|
|||||||
private static final int SALT_LEN = 20;
|
private static final int SALT_LEN = 20;
|
||||||
|
|
||||||
static {
|
static {
|
||||||
java.security.AccessController.doPrivileged((PrivilegedAction<?>)new sun.security.action.LoadLibraryAction("osx"));
|
AccessController.doPrivileged(
|
||||||
|
new PrivilegedAction<Void>() {
|
||||||
|
public Void run() {
|
||||||
|
System.loadLibrary("osx");
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
});
|
||||||
try {
|
try {
|
||||||
PKCS8ShroudedKeyBag_OID = new ObjectIdentifier(keyBag);
|
PKCS8ShroudedKeyBag_OID = new ObjectIdentifier(keyBag);
|
||||||
pbeWithSHAAnd3KeyTripleDESCBC_OID = new ObjectIdentifier(pbeWithSHAAnd3KeyTripleDESCBC);
|
pbeWithSHAAnd3KeyTripleDESCBC_OID = new ObjectIdentifier(pbeWithSHAAnd3KeyTripleDESCBC);
|
||||||
|
@ -27,7 +27,13 @@ package com.apple.concurrent;
|
|||||||
|
|
||||||
final class LibDispatchNative {
|
final class LibDispatchNative {
|
||||||
static {
|
static {
|
||||||
java.security.AccessController.doPrivileged((java.security.PrivilegedAction<?>)new sun.security.action.LoadLibraryAction("osx"));
|
java.security.AccessController.doPrivileged(
|
||||||
|
new java.security.PrivilegedAction<Void>() {
|
||||||
|
public Void run() {
|
||||||
|
System.loadLibrary("osx");
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
static native boolean nativeIsDispatchSupported();
|
static native boolean nativeIsDispatchSupported();
|
||||||
|
@ -28,7 +28,6 @@ package com.apple.eawt;
|
|||||||
import java.awt.*;
|
import java.awt.*;
|
||||||
import java.awt.peer.*;
|
import java.awt.peer.*;
|
||||||
import java.beans.Beans;
|
import java.beans.Beans;
|
||||||
import java.security.PrivilegedAction;
|
|
||||||
|
|
||||||
import javax.swing.JMenuBar;
|
import javax.swing.JMenuBar;
|
||||||
|
|
||||||
@ -59,7 +58,13 @@ public class Application {
|
|||||||
static Application sApplication = null;
|
static Application sApplication = null;
|
||||||
|
|
||||||
static {
|
static {
|
||||||
java.security.AccessController.doPrivileged((PrivilegedAction<?>)new sun.security.action.LoadLibraryAction("awt"));
|
java.security.AccessController.doPrivileged(
|
||||||
|
new java.security.PrivilegedAction<Void>() {
|
||||||
|
public Void run() {
|
||||||
|
System.loadLibrary("awt");
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
checkSecurity();
|
checkSecurity();
|
||||||
if (!Beans.isDesignTime()) {
|
if (!Beans.isDesignTime()) {
|
||||||
|
@ -55,7 +55,13 @@ import java.io.*;
|
|||||||
*/
|
*/
|
||||||
public class FileManager {
|
public class FileManager {
|
||||||
static {
|
static {
|
||||||
java.security.AccessController.doPrivileged((java.security.PrivilegedAction<?>)new sun.security.action.LoadLibraryAction("osx"));
|
java.security.AccessController.doPrivileged(
|
||||||
|
new java.security.PrivilegedAction<Void>() {
|
||||||
|
public Void run() {
|
||||||
|
System.loadLibrary("osx");
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -26,7 +26,6 @@
|
|||||||
package com.apple.laf;
|
package com.apple.laf;
|
||||||
|
|
||||||
import java.io.*;
|
import java.io.*;
|
||||||
import java.security.PrivilegedAction;
|
|
||||||
import java.util.*;
|
import java.util.*;
|
||||||
import java.util.Map.Entry;
|
import java.util.Map.Entry;
|
||||||
|
|
||||||
@ -57,7 +56,13 @@ class AquaFileView extends FileView {
|
|||||||
static final int kLSItemInfoExtensionIsHidden = 0x00100000; /* Item has a hidden extension*/
|
static final int kLSItemInfoExtensionIsHidden = 0x00100000; /* Item has a hidden extension*/
|
||||||
|
|
||||||
static {
|
static {
|
||||||
java.security.AccessController.doPrivileged((PrivilegedAction<?>)new sun.security.action.LoadLibraryAction("osxui"));
|
java.security.AccessController.doPrivileged(
|
||||||
|
new java.security.PrivilegedAction<Void>() {
|
||||||
|
public Void run() {
|
||||||
|
System.loadLibrary("osxui");
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO: Un-comment this out when the native version exists
|
// TODO: Un-comment this out when the native version exists
|
||||||
|
@ -134,10 +134,16 @@ public class AquaLookAndFeel extends BasicLookAndFeel {
|
|||||||
* @see UIManager#setLookAndFeel
|
* @see UIManager#setLookAndFeel
|
||||||
*/
|
*/
|
||||||
public void initialize() {
|
public void initialize() {
|
||||||
java.security.AccessController.doPrivileged((PrivilegedAction<?>)new sun.security.action.LoadLibraryAction("osxui"));
|
java.security.AccessController.doPrivileged(new PrivilegedAction<Void>() {
|
||||||
java.security.AccessController.doPrivileged(new PrivilegedAction<Object>(){
|
public Void run() {
|
||||||
|
System.loadLibrary("osxui");
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
java.security.AccessController.doPrivileged(new PrivilegedAction<Void>(){
|
||||||
@Override
|
@Override
|
||||||
public Object run() {
|
public Void run() {
|
||||||
JRSUIControl.initJRSUI();
|
JRSUIControl.initJRSUI();
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
@ -27,7 +27,6 @@ package com.apple.laf;
|
|||||||
|
|
||||||
import java.awt.*;
|
import java.awt.*;
|
||||||
import java.awt.image.BufferedImage;
|
import java.awt.image.BufferedImage;
|
||||||
import java.security.PrivilegedAction;
|
|
||||||
|
|
||||||
import javax.swing.plaf.UIResource;
|
import javax.swing.plaf.UIResource;
|
||||||
|
|
||||||
@ -35,7 +34,13 @@ import com.apple.laf.AquaUtils.RecyclableSingleton;
|
|||||||
|
|
||||||
public class AquaNativeResources {
|
public class AquaNativeResources {
|
||||||
static {
|
static {
|
||||||
java.security.AccessController.doPrivileged((PrivilegedAction<?>)new sun.security.action.LoadLibraryAction("osxui"));
|
java.security.AccessController.doPrivileged(
|
||||||
|
new java.security.PrivilegedAction<Void>() {
|
||||||
|
public Void run() {
|
||||||
|
System.loadLibrary("osxui");
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO: removing CColorPaint for now
|
// TODO: removing CColorPaint for now
|
||||||
|
@ -28,7 +28,6 @@ package com.apple.laf;
|
|||||||
import java.awt.*;
|
import java.awt.*;
|
||||||
import java.awt.event.*;
|
import java.awt.event.*;
|
||||||
import java.awt.peer.MenuComponentPeer;
|
import java.awt.peer.MenuComponentPeer;
|
||||||
import java.security.PrivilegedAction;
|
|
||||||
import java.util.Hashtable;
|
import java.util.Hashtable;
|
||||||
|
|
||||||
import javax.swing.*;
|
import javax.swing.*;
|
||||||
@ -38,7 +37,13 @@ import sun.lwawt.macosx.*;
|
|||||||
|
|
||||||
class ScreenMenu extends Menu implements ContainerListener, ComponentListener, ScreenMenuPropertyHandler {
|
class ScreenMenu extends Menu implements ContainerListener, ComponentListener, ScreenMenuPropertyHandler {
|
||||||
static {
|
static {
|
||||||
java.security.AccessController.doPrivileged((PrivilegedAction<?>)new sun.security.action.LoadLibraryAction("awt"));
|
java.security.AccessController.doPrivileged(
|
||||||
|
new java.security.PrivilegedAction<Void>() {
|
||||||
|
public Void run() {
|
||||||
|
System.loadLibrary("awt");
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
// screen menu stuff
|
// screen menu stuff
|
||||||
|
@ -26,15 +26,19 @@
|
|||||||
package com.apple.laf;
|
package com.apple.laf;
|
||||||
|
|
||||||
import java.awt.*;
|
import java.awt.*;
|
||||||
import java.security.PrivilegedAction;
|
|
||||||
|
|
||||||
import javax.swing.*;
|
import javax.swing.*;
|
||||||
|
|
||||||
import sun.lwawt.macosx.CPlatformWindow;
|
import sun.lwawt.macosx.CPlatformWindow;
|
||||||
|
|
||||||
class ScreenPopupFactory extends PopupFactory {
|
class ScreenPopupFactory extends PopupFactory {
|
||||||
static {
|
static {
|
||||||
java.security.AccessController.doPrivileged((PrivilegedAction<?>)new sun.security.action.LoadLibraryAction("osxui"));
|
java.security.AccessController.doPrivileged(
|
||||||
|
new java.security.PrivilegedAction<Void>() {
|
||||||
|
public Void run() {
|
||||||
|
System.loadLibrary("osxui");
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
static final Float TRANSLUCENT = new Float(248f/255f);
|
static final Float TRANSLUCENT = new Float(248f/255f);
|
||||||
|
@ -25,6 +25,8 @@
|
|||||||
|
|
||||||
package java.util.prefs;
|
package java.util.prefs;
|
||||||
|
|
||||||
|
import java.util.Objects;
|
||||||
|
|
||||||
class MacOSXPreferences extends AbstractPreferences {
|
class MacOSXPreferences extends AbstractPreferences {
|
||||||
// fixme need security checks?
|
// fixme need security checks?
|
||||||
|
|
||||||
@ -147,6 +149,7 @@ class MacOSXPreferences extends AbstractPreferences {
|
|||||||
// AbstractPreferences implementation
|
// AbstractPreferences implementation
|
||||||
protected void removeSpi(String key)
|
protected void removeSpi(String key)
|
||||||
{
|
{
|
||||||
|
Objects.requireNonNull(key, "Specified key cannot be null");
|
||||||
file.removeKeyFromNode(path, key);
|
file.removeKeyFromNode(path, key);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -228,11 +231,17 @@ class MacOSXPreferences extends AbstractPreferences {
|
|||||||
if (isRemoved())
|
if (isRemoved())
|
||||||
throw new IllegalStateException("Node has been removed");
|
throw new IllegalStateException("Node has been removed");
|
||||||
// fixme! overkill
|
// fixme! overkill
|
||||||
|
if (isUser) {
|
||||||
|
if (!MacOSXPreferencesFile.syncUser()) {
|
||||||
|
throw new BackingStoreException("Synchronization failed for node '" + path + "'");
|
||||||
|
}
|
||||||
|
} else {
|
||||||
if (!MacOSXPreferencesFile.syncWorld()) {
|
if (!MacOSXPreferencesFile.syncWorld()) {
|
||||||
throw new BackingStoreException("Synchronization failed for node '" + path + "'");
|
throw new BackingStoreException("Synchronization failed for node '" + path + "'");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// AbstractPreferences implementation
|
// AbstractPreferences implementation
|
||||||
protected void syncSpi()
|
protected void syncSpi()
|
||||||
|
@ -79,7 +79,13 @@ import java.lang.ref.WeakReference;
|
|||||||
class MacOSXPreferencesFile {
|
class MacOSXPreferencesFile {
|
||||||
|
|
||||||
static {
|
static {
|
||||||
java.security.AccessController.doPrivileged(new sun.security.action.LoadLibraryAction("osx"));
|
java.security.AccessController.doPrivileged(
|
||||||
|
new java.security.PrivilegedAction<Void>() {
|
||||||
|
public Void run() {
|
||||||
|
System.loadLibrary("osx");
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
private class FlushTask extends TimerTask {
|
private class FlushTask extends TimerTask {
|
||||||
@ -192,6 +198,39 @@ class MacOSXPreferencesFile {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
// Sync only current user preferences
|
||||||
|
static synchronized boolean syncUser() {
|
||||||
|
boolean ok = true;
|
||||||
|
if (cachedFiles != null && !cachedFiles.isEmpty()) {
|
||||||
|
Iterator<WeakReference> iter = cachedFiles.values().iterator();
|
||||||
|
while (iter.hasNext()) {
|
||||||
|
WeakReference ref = iter.next();
|
||||||
|
MacOSXPreferencesFile f = (MacOSXPreferencesFile)ref.get();
|
||||||
|
if (f != null && f.user == cfCurrentUser) {
|
||||||
|
if (!f.synchronize()) {
|
||||||
|
ok = false;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
iter.remove();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// Remove synchronized file from changed file list. The changed files were
|
||||||
|
// guaranteed to have been in the cached file list (because there was a strong
|
||||||
|
// reference from changedFiles.
|
||||||
|
if (changedFiles != null) {
|
||||||
|
Iterator<MacOSXPreferencesFile> iterChanged = changedFiles.iterator();
|
||||||
|
while (iterChanged.hasNext()) {
|
||||||
|
MacOSXPreferencesFile f = iterChanged.next();
|
||||||
|
if (f != null && f.user == cfCurrentUser)
|
||||||
|
iterChanged.remove();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return ok;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
// Write all prefs changes to disk, but do not clear all cached prefs
|
// Write all prefs changes to disk, but do not clear all cached prefs
|
||||||
// values. Also kills any scheduled flush task.
|
// values. Also kills any scheduled flush task.
|
||||||
// There's no CFPreferencesFlush() (<rdar://problem/3049129>), so lots of cached prefs
|
// There's no CFPreferencesFlush() (<rdar://problem/3049129>), so lots of cached prefs
|
||||||
|
@ -58,9 +58,15 @@ public class CGraphicsEnvironment extends SunGraphicsEnvironment {
|
|||||||
public static void init() { }
|
public static void init() { }
|
||||||
|
|
||||||
static {
|
static {
|
||||||
java.security.AccessController.doPrivileged(new sun.security.action.LoadLibraryAction("awt"));
|
java.security.AccessController.doPrivileged(new java.security.PrivilegedAction<Void>() {
|
||||||
java.security.AccessController.doPrivileged(new java.security.PrivilegedAction<Object>() {
|
public Void run() {
|
||||||
public Object run() {
|
System.loadLibrary("awt");
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
java.security.AccessController.doPrivileged(new java.security.PrivilegedAction<Void>() {
|
||||||
|
public Void run() {
|
||||||
if (isHeadless()) return null;
|
if (isHeadless()) return null;
|
||||||
initCocoa();
|
initCocoa();
|
||||||
return null;
|
return null;
|
||||||
|
@ -29,7 +29,6 @@ import java.awt.*;
|
|||||||
import java.beans.*;
|
import java.beans.*;
|
||||||
import java.lang.reflect.Field;
|
import java.lang.reflect.Field;
|
||||||
import java.lang.reflect.InvocationTargetException;
|
import java.lang.reflect.InvocationTargetException;
|
||||||
import java.security.PrivilegedAction;
|
|
||||||
import java.util.*;
|
import java.util.*;
|
||||||
import java.util.concurrent.Callable;
|
import java.util.concurrent.Callable;
|
||||||
|
|
||||||
@ -41,7 +40,13 @@ class CAccessibility implements PropertyChangeListener {
|
|||||||
|
|
||||||
static {
|
static {
|
||||||
// Need to load the native library for this code.
|
// Need to load the native library for this code.
|
||||||
java.security.AccessController.doPrivileged((PrivilegedAction<?>)new sun.security.action.LoadLibraryAction("awt"));
|
java.security.AccessController.doPrivileged(
|
||||||
|
new java.security.PrivilegedAction<Void>() {
|
||||||
|
public Void run() {
|
||||||
|
System.loadLibrary("awt");
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
static CAccessibility sAccessibility;
|
static CAccessibility sAccessibility;
|
||||||
|
@ -695,6 +695,13 @@ SetClassPath(const char *s)
|
|||||||
char *def;
|
char *def;
|
||||||
const char *orig = s;
|
const char *orig = s;
|
||||||
static const char format[] = "-Djava.class.path=%s";
|
static const char format[] = "-Djava.class.path=%s";
|
||||||
|
/*
|
||||||
|
* usually we should not get a null pointer, but there are cases where
|
||||||
|
* we might just get one, in which case we simply ignore it, and let the
|
||||||
|
* caller deal with it
|
||||||
|
*/
|
||||||
|
if (s == NULL)
|
||||||
|
return;
|
||||||
s = JLI_WildcardExpandClasspath(s);
|
s = JLI_WildcardExpandClasspath(s);
|
||||||
def = JLI_MemAlloc(sizeof(format)
|
def = JLI_MemAlloc(sizeof(format)
|
||||||
- 2 /* strlen("%s") */
|
- 2 /* strlen("%s") */
|
||||||
|
@ -87,7 +87,12 @@ public class JPEGImageReader extends ImageReader {
|
|||||||
|
|
||||||
static {
|
static {
|
||||||
java.security.AccessController.doPrivileged(
|
java.security.AccessController.doPrivileged(
|
||||||
new sun.security.action.LoadLibraryAction("jpeg"));
|
new java.security.PrivilegedAction<Void>() {
|
||||||
|
public Void run() {
|
||||||
|
System.loadLibrary("jpeg");
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
});
|
||||||
initReaderIDs(ImageInputStream.class,
|
initReaderIDs(ImageInputStream.class,
|
||||||
JPEGQTable.class,
|
JPEGQTable.class,
|
||||||
JPEGHuffmanTable.class);
|
JPEGHuffmanTable.class);
|
||||||
|
@ -177,7 +177,12 @@ public class JPEGImageWriter extends ImageWriter {
|
|||||||
|
|
||||||
static {
|
static {
|
||||||
java.security.AccessController.doPrivileged(
|
java.security.AccessController.doPrivileged(
|
||||||
new sun.security.action.LoadLibraryAction("jpeg"));
|
new java.security.PrivilegedAction<Void>() {
|
||||||
|
public Void run() {
|
||||||
|
System.loadLibrary("jpeg");
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
});
|
||||||
initWriterIDs(ImageOutputStream.class,
|
initWriterIDs(ImageOutputStream.class,
|
||||||
JPEGQTable.class,
|
JPEGQTable.class,
|
||||||
JPEGHuffmanTable.class);
|
JPEGHuffmanTable.class);
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
|
* Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
|
||||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||||
*
|
*
|
||||||
* This code is free software; you can redistribute it and/or modify it
|
* This code is free software; you can redistribute it and/or modify it
|
||||||
@ -166,6 +166,7 @@ class Attribute implements Comparable<Attribute> {
|
|||||||
define(sd, ATTR_CONTEXT_CLASS, "SourceFile", "RUH");
|
define(sd, ATTR_CONTEXT_CLASS, "SourceFile", "RUH");
|
||||||
define(sd, ATTR_CONTEXT_CLASS, "EnclosingMethod", "RCHRDNH");
|
define(sd, ATTR_CONTEXT_CLASS, "EnclosingMethod", "RCHRDNH");
|
||||||
define(sd, ATTR_CONTEXT_CLASS, "InnerClasses", "NH[RCHRCNHRUNHFH]");
|
define(sd, ATTR_CONTEXT_CLASS, "InnerClasses", "NH[RCHRCNHRUNHFH]");
|
||||||
|
define(sd, ATTR_CONTEXT_CLASS, "BootstrapMethods", "NH[RMHNH[KLH]]");
|
||||||
|
|
||||||
define(sd, ATTR_CONTEXT_FIELD, "Signature", "RSH");
|
define(sd, ATTR_CONTEXT_FIELD, "Signature", "RSH");
|
||||||
define(sd, ATTR_CONTEXT_FIELD, "Synthetic", "");
|
define(sd, ATTR_CONTEXT_FIELD, "Synthetic", "");
|
||||||
@ -203,6 +204,8 @@ class Attribute implements Comparable<Attribute> {
|
|||||||
// Their layout specs. are given here for completeness.
|
// Their layout specs. are given here for completeness.
|
||||||
// The Code spec is incomplete, in that it does not distinguish
|
// The Code spec is incomplete, in that it does not distinguish
|
||||||
// bytecode bytes or locate CP references.
|
// bytecode bytes or locate CP references.
|
||||||
|
// The BootstrapMethods attribute is also special-cased
|
||||||
|
// elsewhere as an appendix to the local constant pool.
|
||||||
}
|
}
|
||||||
|
|
||||||
// Metadata.
|
// Metadata.
|
||||||
@ -822,9 +825,9 @@ class Attribute implements Comparable<Attribute> {
|
|||||||
reference_type:
|
reference_type:
|
||||||
( constant_ref | schema_ref | utf8_ref | untyped_ref )
|
( constant_ref | schema_ref | utf8_ref | untyped_ref )
|
||||||
constant_ref:
|
constant_ref:
|
||||||
( 'KI' | 'KJ' | 'KF' | 'KD' | 'KS' | 'KQ' )
|
( 'KI' | 'KJ' | 'KF' | 'KD' | 'KS' | 'KQ' | 'KM' | 'KT' | 'KL' )
|
||||||
schema_ref:
|
schema_ref:
|
||||||
( 'RC' | 'RS' | 'RD' | 'RF' | 'RM' | 'RI' )
|
( 'RC' | 'RS' | 'RD' | 'RF' | 'RM' | 'RI' | 'RY' | 'RB' | 'RN' )
|
||||||
utf8_ref:
|
utf8_ref:
|
||||||
'RU'
|
'RU'
|
||||||
untyped_ref:
|
untyped_ref:
|
||||||
@ -1012,7 +1015,12 @@ class Attribute implements Comparable<Attribute> {
|
|||||||
case 'F': e.refKind = CONSTANT_Float; break;
|
case 'F': e.refKind = CONSTANT_Float; break;
|
||||||
case 'D': e.refKind = CONSTANT_Double; break;
|
case 'D': e.refKind = CONSTANT_Double; break;
|
||||||
case 'S': e.refKind = CONSTANT_String; break;
|
case 'S': e.refKind = CONSTANT_String; break;
|
||||||
case 'Q': e.refKind = CONSTANT_Literal; break;
|
case 'Q': e.refKind = CONSTANT_FieldSpecific; break;
|
||||||
|
|
||||||
|
// new in 1.7:
|
||||||
|
case 'M': e.refKind = CONSTANT_MethodHandle; break;
|
||||||
|
case 'T': e.refKind = CONSTANT_MethodType; break;
|
||||||
|
case 'L': e.refKind = CONSTANT_LoadableValue; break;
|
||||||
default: { i = -i; continue; } // fail
|
default: { i = -i; continue; } // fail
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
@ -1029,6 +1037,11 @@ class Attribute implements Comparable<Attribute> {
|
|||||||
case 'U': e.refKind = CONSTANT_Utf8; break; //utf8_ref
|
case 'U': e.refKind = CONSTANT_Utf8; break; //utf8_ref
|
||||||
case 'Q': e.refKind = CONSTANT_All; break; //untyped_ref
|
case 'Q': e.refKind = CONSTANT_All; break; //untyped_ref
|
||||||
|
|
||||||
|
// new in 1.7:
|
||||||
|
case 'Y': e.refKind = CONSTANT_InvokeDynamic; break;
|
||||||
|
case 'B': e.refKind = CONSTANT_BootstrapMethod; break;
|
||||||
|
case 'N': e.refKind = CONSTANT_AnyMember; break;
|
||||||
|
|
||||||
default: { i = -i; continue; } // fail
|
default: { i = -i; continue; } // fail
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
@ -1279,10 +1292,12 @@ class Attribute implements Comparable<Attribute> {
|
|||||||
// Cf. ClassReader.readSignatureRef.
|
// Cf. ClassReader.readSignatureRef.
|
||||||
String typeName = globalRef.stringValue();
|
String typeName = globalRef.stringValue();
|
||||||
globalRef = ConstantPool.getSignatureEntry(typeName);
|
globalRef = ConstantPool.getSignatureEntry(typeName);
|
||||||
} else if (e.refKind == CONSTANT_Literal) {
|
} else if (e.refKind == CONSTANT_FieldSpecific) {
|
||||||
assert(globalRef.getTag() >= CONSTANT_Integer);
|
assert(globalRef.getTag() >= CONSTANT_Integer);
|
||||||
assert(globalRef.getTag() <= CONSTANT_String);
|
assert(globalRef.getTag() <= CONSTANT_String ||
|
||||||
} else if (e.refKind != CONSTANT_All) {
|
globalRef.getTag() >= CONSTANT_MethodHandle);
|
||||||
|
assert(globalRef.getTag() <= CONSTANT_MethodType);
|
||||||
|
} else if (e.refKind < CONSTANT_GroupFirst) {
|
||||||
assert(e.refKind == globalRef.getTag());
|
assert(e.refKind == globalRef.getTag());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -1462,27 +1477,29 @@ class Attribute implements Comparable<Attribute> {
|
|||||||
"NH[PHPOHIIH]", // CharacterRangeTable
|
"NH[PHPOHIIH]", // CharacterRangeTable
|
||||||
"NH[PHHII]", // CoverageTable
|
"NH[PHHII]", // CoverageTable
|
||||||
"NH[RCHRCNHRUNHFH]", // InnerClasses
|
"NH[RCHRCNHRUNHFH]", // InnerClasses
|
||||||
|
"NH[RMHNH[KLH]]", // BootstrapMethods
|
||||||
"HHNI[B]NH[PHPOHPOHRCNH]NH[RUHNI[B]]", // Code
|
"HHNI[B]NH[PHPOHPOHRCNH]NH[RUHNI[B]]", // Code
|
||||||
"=AnnotationDefault",
|
"=AnnotationDefault",
|
||||||
// Like metadata, but with a compact tag set:
|
// Like metadata, but with a compact tag set:
|
||||||
"[NH[(1)]]"
|
"[NH[(1)]]"
|
||||||
+"[NH[(2)]]"
|
+"[NH[(1)]]"
|
||||||
+"[RSHNH[RUH(3)]]"
|
+"[RSHNH[RUH(1)]]"
|
||||||
+"[TB(0,1,3)[KIH](2)[KDH](5)[KFH](4)[KJH](7)[RSH](8)[RSHRUH](9)[RUH](10)[(2)](6)[NH[(3)]]()[]]",
|
+"[TB(0,1,3)[KIH](2)[KDH](5)[KFH](4)[KJH](7)[RSH](8)[RSHRUH](9)[RUH](10)[(-1)](6)[NH[(0)]]()[]]",
|
||||||
""
|
""
|
||||||
};
|
};
|
||||||
ap = 0;
|
ap = 0;
|
||||||
}
|
}
|
||||||
|
Utils.currentInstance.set(new PackerImpl());
|
||||||
final int[][] counts = new int[2][3]; // int bci ref
|
final int[][] counts = new int[2][3]; // int bci ref
|
||||||
final Entry[] cpMap = new Entry[maxVal+1];
|
final Entry[] cpMap = new Entry[maxVal+1];
|
||||||
for (int i = 0; i < cpMap.length; i++) {
|
for (int i = 0; i < cpMap.length; i++) {
|
||||||
if (i == 0) continue; // 0 => null
|
if (i == 0) continue; // 0 => null
|
||||||
cpMap[i] = ConstantPool.getLiteralEntry(new Integer(i));
|
cpMap[i] = ConstantPool.getLiteralEntry(new Integer(i));
|
||||||
}
|
}
|
||||||
Class cls = new Package().new Class("");
|
Package.Class cls = new Package().new Class("");
|
||||||
cls.cpMap = cpMap;
|
cls.cpMap = cpMap;
|
||||||
class TestValueStream extends ValueStream {
|
class TestValueStream extends ValueStream {
|
||||||
Random rand = new Random(0);
|
java.util.Random rand = new java.util.Random(0);
|
||||||
ArrayList history = new ArrayList();
|
ArrayList history = new ArrayList();
|
||||||
int ckidx = 0;
|
int ckidx = 0;
|
||||||
int maxVal;
|
int maxVal;
|
||||||
@ -1570,8 +1587,7 @@ class Attribute implements Comparable<Attribute> {
|
|||||||
String layout = av[i];
|
String layout = av[i];
|
||||||
if (layout.startsWith("=")) {
|
if (layout.startsWith("=")) {
|
||||||
String name = layout.substring(1);
|
String name = layout.substring(1);
|
||||||
for (Iterator j = standardDefs.values().iterator(); j.hasNext(); ) {
|
for (Attribute a : standardDefs.values()) {
|
||||||
Attribute a = (Attribute) j.next();
|
|
||||||
if (a.name().equals(name)) {
|
if (a.name().equals(name)) {
|
||||||
layout = a.layout().layout();
|
layout = a.layout().layout();
|
||||||
break;
|
break;
|
||||||
@ -1604,7 +1620,7 @@ class Attribute implements Comparable<Attribute> {
|
|||||||
if (verbose) {
|
if (verbose) {
|
||||||
System.out.print(" parse: {");
|
System.out.print(" parse: {");
|
||||||
}
|
}
|
||||||
self.parse(0, cls, bytes, 0, bytes.length, tts);
|
self.parse(cls, bytes, 0, bytes.length, tts);
|
||||||
if (verbose) {
|
if (verbose) {
|
||||||
System.out.println("}");
|
System.out.println("}");
|
||||||
}
|
}
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
|
* Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
|
||||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||||
*
|
*
|
||||||
* This code is free software; you can redistribute it and/or modify it
|
* This code is free software; you can redistribute it and/or modify it
|
||||||
@ -1372,17 +1372,17 @@ class BandStructure {
|
|||||||
protected long archiveSize1; // size reported in archive_header
|
protected long archiveSize1; // size reported in archive_header
|
||||||
protected int archiveNextCount; // reported in archive_header
|
protected int archiveNextCount; // reported in archive_header
|
||||||
|
|
||||||
static final int AH_LENGTH_0 = 3; //minver, majver, options
|
static final int AH_LENGTH_0 = 3; // archive_header_0 = {minver, majver, options}
|
||||||
static final int AH_ARCHIVE_SIZE_HI = 0;
|
static final int AH_LENGTH_MIN = 15; // observed in spec {header_0[3], cp_counts[8], class_counts[4]}
|
||||||
static final int AH_ARCHIVE_SIZE_LO = 1;
|
// Length contributions from optional archive size fields:
|
||||||
static final int AH_LENGTH_S = 2; //optional size hi/lo
|
static final int AH_LENGTH_S = 2; // archive_header_S = optional {size_hi, size_lo}
|
||||||
static final int AH_LENGTH = 26; // mentioned in spec
|
static final int AH_ARCHIVE_SIZE_HI = 0; // offset in archive_header_S
|
||||||
|
static final int AH_ARCHIVE_SIZE_LO = 1; // offset in archive_header_S
|
||||||
// Length contributions from optional header fields:
|
// Length contributions from optional header fields:
|
||||||
static final int AH_FILE_HEADER_LEN = 5; // sizehi/lo/next/modtime/files
|
static final int AH_FILE_HEADER_LEN = 5; // file_counts = {{size_hi, size_lo}, next, modtime, files}
|
||||||
static final int AH_SPECIAL_FORMAT_LEN = 2; // layouts/band-headers
|
static final int AH_SPECIAL_FORMAT_LEN = 2; // special_counts = {layouts, band_headers}
|
||||||
static final int AH_CP_NUMBER_LEN = 4; // int/float/long/double
|
static final int AH_CP_NUMBER_LEN = 4; // cp_number_counts = {int, float, long, double}
|
||||||
static final int AH_LENGTH_MIN = AH_LENGTH
|
static final int AH_CP_EXTRA_LEN = 4; // cp_attr_counts = {MH, MT, InDy, BSM}
|
||||||
-(AH_SPECIAL_FORMAT_LEN+AH_FILE_HEADER_LEN+AH_CP_NUMBER_LEN);
|
|
||||||
|
|
||||||
// Common structure of attribute band groups:
|
// Common structure of attribute band groups:
|
||||||
static final int AB_FLAGS_HI = 0;
|
static final int AB_FLAGS_HI = 0;
|
||||||
@ -1446,6 +1446,14 @@ class BandStructure {
|
|||||||
CPRefBand cp_Method_desc = cp_bands.newCPRefBand("cp_Method_desc", UDELTA5, CONSTANT_NameandType);
|
CPRefBand cp_Method_desc = cp_bands.newCPRefBand("cp_Method_desc", UDELTA5, CONSTANT_NameandType);
|
||||||
CPRefBand cp_Imethod_class = cp_bands.newCPRefBand("cp_Imethod_class", CONSTANT_Class);
|
CPRefBand cp_Imethod_class = cp_bands.newCPRefBand("cp_Imethod_class", CONSTANT_Class);
|
||||||
CPRefBand cp_Imethod_desc = cp_bands.newCPRefBand("cp_Imethod_desc", UDELTA5, CONSTANT_NameandType);
|
CPRefBand cp_Imethod_desc = cp_bands.newCPRefBand("cp_Imethod_desc", UDELTA5, CONSTANT_NameandType);
|
||||||
|
IntBand cp_MethodHandle_refkind = cp_bands.newIntBand("cp_MethodHandle_refkind", DELTA5);
|
||||||
|
CPRefBand cp_MethodHandle_member = cp_bands.newCPRefBand("cp_MethodHandle_member", UDELTA5, CONSTANT_AnyMember);
|
||||||
|
CPRefBand cp_MethodType = cp_bands.newCPRefBand("cp_MethodType", UDELTA5, CONSTANT_Signature);
|
||||||
|
CPRefBand cp_BootstrapMethod_ref = cp_bands.newCPRefBand("cp_BootstrapMethod_ref", DELTA5, CONSTANT_MethodHandle);
|
||||||
|
IntBand cp_BootstrapMethod_arg_count = cp_bands.newIntBand("cp_BootstrapMethod_arg_count", UDELTA5);
|
||||||
|
CPRefBand cp_BootstrapMethod_arg = cp_bands.newCPRefBand("cp_BootstrapMethod_arg", DELTA5, CONSTANT_LoadableValue);
|
||||||
|
CPRefBand cp_InvokeDynamic_spec = cp_bands.newCPRefBand("cp_InvokeDynamic_spec", DELTA5, CONSTANT_BootstrapMethod);
|
||||||
|
CPRefBand cp_InvokeDynamic_desc = cp_bands.newCPRefBand("cp_InvokeDynamic_desc", UDELTA5, CONSTANT_NameandType);
|
||||||
|
|
||||||
// bands for carrying attribute definitions:
|
// bands for carrying attribute definitions:
|
||||||
MultiBand attr_definition_bands = all_bands.newMultiBand("(attr_definition_bands)", UNSIGNED5);
|
MultiBand attr_definition_bands = all_bands.newMultiBand("(attr_definition_bands)", UNSIGNED5);
|
||||||
@ -1481,7 +1489,7 @@ class BandStructure {
|
|||||||
IntBand field_attr_calls = field_attr_bands.newIntBand("field_attr_calls");
|
IntBand field_attr_calls = field_attr_bands.newIntBand("field_attr_calls");
|
||||||
|
|
||||||
// bands for predefined field attributes
|
// bands for predefined field attributes
|
||||||
CPRefBand field_ConstantValue_KQ = field_attr_bands.newCPRefBand("field_ConstantValue_KQ", CONSTANT_Literal);
|
CPRefBand field_ConstantValue_KQ = field_attr_bands.newCPRefBand("field_ConstantValue_KQ", CONSTANT_FieldSpecific);
|
||||||
CPRefBand field_Signature_RS = field_attr_bands.newCPRefBand("field_Signature_RS", CONSTANT_Signature);
|
CPRefBand field_Signature_RS = field_attr_bands.newCPRefBand("field_Signature_RS", CONSTANT_Signature);
|
||||||
MultiBand field_metadata_bands = field_attr_bands.newMultiBand("(field_metadata_bands)", UNSIGNED5);
|
MultiBand field_metadata_bands = field_attr_bands.newMultiBand("(field_metadata_bands)", UNSIGNED5);
|
||||||
|
|
||||||
@ -1585,12 +1593,14 @@ class BandStructure {
|
|||||||
CPRefBand bc_longref = bc_bands.newCPRefBand("bc_longref", DELTA5, CONSTANT_Long);
|
CPRefBand bc_longref = bc_bands.newCPRefBand("bc_longref", DELTA5, CONSTANT_Long);
|
||||||
CPRefBand bc_doubleref = bc_bands.newCPRefBand("bc_doubleref", DELTA5, CONSTANT_Double);
|
CPRefBand bc_doubleref = bc_bands.newCPRefBand("bc_doubleref", DELTA5, CONSTANT_Double);
|
||||||
CPRefBand bc_stringref = bc_bands.newCPRefBand("bc_stringref", DELTA5, CONSTANT_String);
|
CPRefBand bc_stringref = bc_bands.newCPRefBand("bc_stringref", DELTA5, CONSTANT_String);
|
||||||
|
CPRefBand bc_loadablevalueref = bc_bands.newCPRefBand("bc_loadablevalueref", DELTA5, CONSTANT_LoadableValue);
|
||||||
|
|
||||||
// nulls produced by bc_classref are taken to mean the current class
|
// nulls produced by bc_classref are taken to mean the current class
|
||||||
CPRefBand bc_classref = bc_bands.newCPRefBand("bc_classref", UNSIGNED5, CONSTANT_Class, NULL_IS_OK); // new, *anew*, c*cast, i*of, ldc
|
CPRefBand bc_classref = bc_bands.newCPRefBand("bc_classref", UNSIGNED5, CONSTANT_Class, NULL_IS_OK); // new, *anew*, c*cast, i*of, ldc
|
||||||
CPRefBand bc_fieldref = bc_bands.newCPRefBand("bc_fieldref", DELTA5, CONSTANT_Fieldref); // get*, put*
|
CPRefBand bc_fieldref = bc_bands.newCPRefBand("bc_fieldref", DELTA5, CONSTANT_Fieldref); // get*, put*
|
||||||
CPRefBand bc_methodref = bc_bands.newCPRefBand("bc_methodref", CONSTANT_Methodref); // invoke[vs]*
|
CPRefBand bc_methodref = bc_bands.newCPRefBand("bc_methodref", CONSTANT_Methodref); // invoke[vs]*
|
||||||
CPRefBand bc_imethodref = bc_bands.newCPRefBand("bc_imethodref", DELTA5, CONSTANT_InterfaceMethodref); // invokeinterface
|
CPRefBand bc_imethodref = bc_bands.newCPRefBand("bc_imethodref", DELTA5, CONSTANT_InterfaceMethodref); // invokeinterface
|
||||||
|
CPRefBand bc_indyref = bc_bands.newCPRefBand("bc_indyref", DELTA5, CONSTANT_InvokeDynamic); // invokedynamic
|
||||||
|
|
||||||
// _self_linker_op family
|
// _self_linker_op family
|
||||||
CPRefBand bc_thisfield = bc_bands.newCPRefBand("bc_thisfield", CONSTANT_None); // any field within cur. class
|
CPRefBand bc_thisfield = bc_bands.newCPRefBand("bc_thisfield", CONSTANT_None); // any field within cur. class
|
||||||
@ -1633,7 +1643,7 @@ class BandStructure {
|
|||||||
|
|
||||||
protected void setBandIndex(CPRefBand b, byte which) {
|
protected void setBandIndex(CPRefBand b, byte which) {
|
||||||
Object[] need = { b, Byte.valueOf(which) };
|
Object[] need = { b, Byte.valueOf(which) };
|
||||||
if (which == CONSTANT_Literal) {
|
if (which == CONSTANT_FieldSpecific) {
|
||||||
// I.e., attribute layouts KQ (no null) or KQN (null ok).
|
// I.e., attribute layouts KQ (no null) or KQN (null ok).
|
||||||
allKQBands.add(b);
|
allKQBands.add(b);
|
||||||
} else if (needPredefIndex != null) {
|
} else if (needPredefIndex != null) {
|
||||||
@ -1856,12 +1866,20 @@ class BandStructure {
|
|||||||
attrClassFileVersionMask = (1<<CLASS_ATTR_ClassFile_version);
|
attrClassFileVersionMask = (1<<CLASS_ATTR_ClassFile_version);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void adjustToMajver() {
|
private void adjustToMajver() throws IOException {
|
||||||
if (getPackageMajver() < JAVA6_PACKAGE_MAJOR_VERSION) {
|
if (getPackageMajver() < JAVA6_PACKAGE_MAJOR_VERSION) {
|
||||||
if (verbose > 0) Utils.log.fine("Legacy package version");
|
if (verbose > 0) Utils.log.fine("Legacy package version");
|
||||||
// Revoke definition of pre-1.6 attribute type.
|
// Revoke definition of pre-1.6 attribute type.
|
||||||
undefineAttribute(CODE_ATTR_StackMapTable, ATTR_CONTEXT_CODE);
|
undefineAttribute(CODE_ATTR_StackMapTable, ATTR_CONTEXT_CODE);
|
||||||
}
|
}
|
||||||
|
if (getPackageMajver() < JAVA7_PACKAGE_MAJOR_VERSION) {
|
||||||
|
if (testBit(archiveOptions, AO_HAVE_CP_EXTRAS))
|
||||||
|
// this bit was reserved for future use in previous versions
|
||||||
|
throw new IOException("Format bits for Java 7 must be zero in previous releases");
|
||||||
|
}
|
||||||
|
if (testBit(archiveOptions, AO_UNUSED_MBZ)) {
|
||||||
|
throw new IOException("High archive option bits are reserved and must be zero: "+Integer.toHexString(archiveOptions));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
protected void initAttrIndexLimit() {
|
protected void initAttrIndexLimit() {
|
||||||
@ -2323,7 +2341,9 @@ class BandStructure {
|
|||||||
return bc_methodref;
|
return bc_methodref;
|
||||||
case CONSTANT_InterfaceMethodref:
|
case CONSTANT_InterfaceMethodref:
|
||||||
return bc_imethodref;
|
return bc_imethodref;
|
||||||
case CONSTANT_Literal:
|
case CONSTANT_InvokeDynamic:
|
||||||
|
return bc_indyref;
|
||||||
|
case CONSTANT_LoadableValue:
|
||||||
switch (bc) {
|
switch (bc) {
|
||||||
case _ildc: case _ildc_w:
|
case _ildc: case _ildc_w:
|
||||||
return bc_intref;
|
return bc_intref;
|
||||||
@ -2333,10 +2353,12 @@ class BandStructure {
|
|||||||
return bc_longref;
|
return bc_longref;
|
||||||
case _dldc2_w:
|
case _dldc2_w:
|
||||||
return bc_doubleref;
|
return bc_doubleref;
|
||||||
case _aldc: case _aldc_w:
|
case _sldc: case _sldc_w:
|
||||||
return bc_stringref;
|
return bc_stringref;
|
||||||
case _cldc: case _cldc_w:
|
case _cldc: case _cldc_w:
|
||||||
return bc_classref;
|
return bc_classref;
|
||||||
|
case _qldc: case _qldc_w:
|
||||||
|
return bc_loadablevalueref;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@ -2623,15 +2645,23 @@ class BandStructure {
|
|||||||
}
|
}
|
||||||
|
|
||||||
static void printArrayTo(PrintStream ps, Entry[] cpMap, int start, int end) {
|
static void printArrayTo(PrintStream ps, Entry[] cpMap, int start, int end) {
|
||||||
|
printArrayTo(ps, cpMap, start, end, false);
|
||||||
|
}
|
||||||
|
static void printArrayTo(PrintStream ps, Entry[] cpMap, int start, int end, boolean showTags) {
|
||||||
StringBuffer buf = new StringBuffer();
|
StringBuffer buf = new StringBuffer();
|
||||||
int len = end-start;
|
int len = end-start;
|
||||||
for (int i = 0; i < len; i++) {
|
for (int i = 0; i < len; i++) {
|
||||||
String s = cpMap[start+i].stringValue();
|
Entry e = cpMap[start+i];
|
||||||
|
ps.print(start+i); ps.print("=");
|
||||||
|
if (showTags) { ps.print(e.tag); ps.print(":"); }
|
||||||
|
String s = e.stringValue();
|
||||||
buf.setLength(0);
|
buf.setLength(0);
|
||||||
for (int j = 0; j < s.length(); j++) {
|
for (int j = 0; j < s.length(); j++) {
|
||||||
char ch = s.charAt(j);
|
char ch = s.charAt(j);
|
||||||
if (!(ch < ' ' || ch > '~' || ch == '\\')) {
|
if (!(ch < ' ' || ch > '~' || ch == '\\')) {
|
||||||
buf.append(ch);
|
buf.append(ch);
|
||||||
|
} else if (ch == '\\') {
|
||||||
|
buf.append("\\\\");
|
||||||
} else if (ch == '\n') {
|
} else if (ch == '\n') {
|
||||||
buf.append("\\n");
|
buf.append("\\n");
|
||||||
} else if (ch == '\t') {
|
} else if (ch == '\t') {
|
||||||
@ -2639,7 +2669,8 @@ class BandStructure {
|
|||||||
} else if (ch == '\r') {
|
} else if (ch == '\r') {
|
||||||
buf.append("\\r");
|
buf.append("\\r");
|
||||||
} else {
|
} else {
|
||||||
buf.append("\\x"+Integer.toHexString(ch));
|
String str = "000"+Integer.toHexString(ch);
|
||||||
|
buf.append("\\u"+str.substring(str.length()-4));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
ps.println(buf);
|
ps.println(buf);
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
|
* Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
|
||||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||||
*
|
*
|
||||||
* This code is free software; you can redistribute it and/or modify it
|
* This code is free software; you can redistribute it and/or modify it
|
||||||
@ -29,6 +29,9 @@ import com.sun.java.util.jar.pack.ConstantPool.ClassEntry;
|
|||||||
import com.sun.java.util.jar.pack.ConstantPool.DescriptorEntry;
|
import com.sun.java.util.jar.pack.ConstantPool.DescriptorEntry;
|
||||||
import com.sun.java.util.jar.pack.ConstantPool.Entry;
|
import com.sun.java.util.jar.pack.ConstantPool.Entry;
|
||||||
import com.sun.java.util.jar.pack.ConstantPool.SignatureEntry;
|
import com.sun.java.util.jar.pack.ConstantPool.SignatureEntry;
|
||||||
|
import com.sun.java.util.jar.pack.ConstantPool.MemberEntry;
|
||||||
|
import com.sun.java.util.jar.pack.ConstantPool.MethodHandleEntry;
|
||||||
|
import com.sun.java.util.jar.pack.ConstantPool.BootstrapMethodEntry;
|
||||||
import com.sun.java.util.jar.pack.ConstantPool.Utf8Entry;
|
import com.sun.java.util.jar.pack.ConstantPool.Utf8Entry;
|
||||||
import com.sun.java.util.jar.pack.Package.Class;
|
import com.sun.java.util.jar.pack.Package.Class;
|
||||||
import com.sun.java.util.jar.pack.Package.InnerClass;
|
import com.sun.java.util.jar.pack.Package.InnerClass;
|
||||||
@ -37,6 +40,7 @@ import java.io.FilterInputStream;
|
|||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.io.InputStream;
|
import java.io.InputStream;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
|
import java.util.Arrays;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import static com.sun.java.util.jar.pack.Constants.*;
|
import static com.sun.java.util.jar.pack.Constants.*;
|
||||||
|
|
||||||
@ -114,6 +118,7 @@ class ClassReader {
|
|||||||
private Entry readRef(byte tag) throws IOException {
|
private Entry readRef(byte tag) throws IOException {
|
||||||
Entry e = readRef();
|
Entry e = readRef();
|
||||||
assert(e != null);
|
assert(e != null);
|
||||||
|
assert(!(e instanceof UnresolvedEntry));
|
||||||
assert(e.tagMatches(tag));
|
assert(e.tagMatches(tag));
|
||||||
return e;
|
return e;
|
||||||
}
|
}
|
||||||
@ -151,6 +156,7 @@ class ClassReader {
|
|||||||
readMembers(false); // fields
|
readMembers(false); // fields
|
||||||
readMembers(true); // methods
|
readMembers(true); // methods
|
||||||
readAttributes(ATTR_CONTEXT_CLASS, cls);
|
readAttributes(ATTR_CONTEXT_CLASS, cls);
|
||||||
|
fixUnresolvedEntries();
|
||||||
cls.finishReading();
|
cls.finishReading();
|
||||||
assert(0 >= in.read(new byte[1]));
|
assert(0 >= in.read(new byte[1]));
|
||||||
ok = true;
|
ok = true;
|
||||||
@ -236,6 +242,7 @@ class ClassReader {
|
|||||||
// just read the refs; do not attempt to resolve while reading
|
// just read the refs; do not attempt to resolve while reading
|
||||||
case CONSTANT_Class:
|
case CONSTANT_Class:
|
||||||
case CONSTANT_String:
|
case CONSTANT_String:
|
||||||
|
case CONSTANT_MethodType:
|
||||||
fixups[fptr++] = i;
|
fixups[fptr++] = i;
|
||||||
fixups[fptr++] = tag;
|
fixups[fptr++] = tag;
|
||||||
fixups[fptr++] = in.readUnsignedShort();
|
fixups[fptr++] = in.readUnsignedShort();
|
||||||
@ -250,6 +257,18 @@ class ClassReader {
|
|||||||
fixups[fptr++] = in.readUnsignedShort();
|
fixups[fptr++] = in.readUnsignedShort();
|
||||||
fixups[fptr++] = in.readUnsignedShort();
|
fixups[fptr++] = in.readUnsignedShort();
|
||||||
break;
|
break;
|
||||||
|
case CONSTANT_InvokeDynamic:
|
||||||
|
fixups[fptr++] = i;
|
||||||
|
fixups[fptr++] = tag;
|
||||||
|
fixups[fptr++] = -1 ^ in.readUnsignedShort(); // not a ref
|
||||||
|
fixups[fptr++] = in.readUnsignedShort();
|
||||||
|
break;
|
||||||
|
case CONSTANT_MethodHandle:
|
||||||
|
fixups[fptr++] = i;
|
||||||
|
fixups[fptr++] = tag;
|
||||||
|
fixups[fptr++] = -1 ^ in.readUnsignedByte();
|
||||||
|
fixups[fptr++] = in.readUnsignedShort();
|
||||||
|
break;
|
||||||
default:
|
default:
|
||||||
throw new ClassFormatException("Bad constant pool tag " +
|
throw new ClassFormatException("Bad constant pool tag " +
|
||||||
tag + " in File: " + cls.file.nameString +
|
tag + " in File: " + cls.file.nameString +
|
||||||
@ -270,7 +289,7 @@ class ClassReader {
|
|||||||
int ref2 = fixups[fi++];
|
int ref2 = fixups[fi++];
|
||||||
if (verbose > 3)
|
if (verbose > 3)
|
||||||
Utils.log.fine(" cp["+cpi+"] = "+ConstantPool.tagName(tag)+"{"+ref+","+ref2+"}");
|
Utils.log.fine(" cp["+cpi+"] = "+ConstantPool.tagName(tag)+"{"+ref+","+ref2+"}");
|
||||||
if (cpMap[ref] == null || ref2 >= 0 && cpMap[ref2] == null) {
|
if (ref >= 0 && cpMap[ref] == null || ref2 >= 0 && cpMap[ref2] == null) {
|
||||||
// Defer.
|
// Defer.
|
||||||
fixups[fptr++] = cpi;
|
fixups[fptr++] = cpi;
|
||||||
fixups[fptr++] = tag;
|
fixups[fptr++] = tag;
|
||||||
@ -297,6 +316,19 @@ class ClassReader {
|
|||||||
Utf8Entry mtype = (Utf8Entry) cpMap[ref2];
|
Utf8Entry mtype = (Utf8Entry) cpMap[ref2];
|
||||||
cpMap[cpi] = ConstantPool.getDescriptorEntry(mname, mtype);
|
cpMap[cpi] = ConstantPool.getDescriptorEntry(mname, mtype);
|
||||||
break;
|
break;
|
||||||
|
case CONSTANT_MethodType:
|
||||||
|
cpMap[cpi] = ConstantPool.getMethodTypeEntry((Utf8Entry) cpMap[ref]);
|
||||||
|
break;
|
||||||
|
case CONSTANT_MethodHandle:
|
||||||
|
byte refKind = (byte)(-1 ^ ref);
|
||||||
|
MemberEntry memRef = (MemberEntry) cpMap[ref2];
|
||||||
|
cpMap[cpi] = ConstantPool.getMethodHandleEntry(refKind, memRef);
|
||||||
|
break;
|
||||||
|
case CONSTANT_InvokeDynamic:
|
||||||
|
DescriptorEntry idescr = (DescriptorEntry) cpMap[ref2];
|
||||||
|
cpMap[cpi] = new UnresolvedEntry((byte)tag, (-1 ^ ref), idescr);
|
||||||
|
// Note that ref must be resolved later, using the BootstrapMethods attribute.
|
||||||
|
break;
|
||||||
default:
|
default:
|
||||||
assert(false);
|
assert(false);
|
||||||
}
|
}
|
||||||
@ -307,6 +339,50 @@ class ClassReader {
|
|||||||
cls.cpMap = cpMap;
|
cls.cpMap = cpMap;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private /*non-static*/
|
||||||
|
class UnresolvedEntry extends Entry {
|
||||||
|
final Object[] refsOrIndexes;
|
||||||
|
UnresolvedEntry(byte tag, Object... refsOrIndexes) {
|
||||||
|
super(tag);
|
||||||
|
this.refsOrIndexes = refsOrIndexes;
|
||||||
|
ClassReader.this.haveUnresolvedEntry = true;
|
||||||
|
}
|
||||||
|
Entry resolve() {
|
||||||
|
Class cls = ClassReader.this.cls;
|
||||||
|
Entry res;
|
||||||
|
switch (tag) {
|
||||||
|
case CONSTANT_InvokeDynamic:
|
||||||
|
BootstrapMethodEntry iboots = cls.bootstrapMethods.get((Integer) refsOrIndexes[0]);
|
||||||
|
DescriptorEntry idescr = (DescriptorEntry) refsOrIndexes[1];
|
||||||
|
res = ConstantPool.getInvokeDynamicEntry(iboots, idescr);
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
throw new AssertionError();
|
||||||
|
}
|
||||||
|
return res;
|
||||||
|
}
|
||||||
|
private void unresolved() { throw new RuntimeException("unresolved entry has no string"); }
|
||||||
|
public int compareTo(Object x) { unresolved(); return 0; }
|
||||||
|
public boolean equals(Object x) { unresolved(); return false; }
|
||||||
|
protected int computeValueHash() { unresolved(); return 0; }
|
||||||
|
public String stringValue() { unresolved(); return toString(); }
|
||||||
|
public String toString() { return "(unresolved "+ConstantPool.tagName(tag)+")"; }
|
||||||
|
}
|
||||||
|
|
||||||
|
boolean haveUnresolvedEntry;
|
||||||
|
private void fixUnresolvedEntries() {
|
||||||
|
if (!haveUnresolvedEntry) return;
|
||||||
|
Entry[] cpMap = cls.getCPMap();
|
||||||
|
for (int i = 0; i < cpMap.length; i++) {
|
||||||
|
Entry e = cpMap[i];
|
||||||
|
if (e instanceof UnresolvedEntry) {
|
||||||
|
cpMap[i] = e = ((UnresolvedEntry)e).resolve();
|
||||||
|
assert(!(e instanceof UnresolvedEntry));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
haveUnresolvedEntry = false;
|
||||||
|
}
|
||||||
|
|
||||||
void readHeader() throws IOException {
|
void readHeader() throws IOException {
|
||||||
cls.flags = readUnsignedShort();
|
cls.flags = readUnsignedShort();
|
||||||
cls.thisClass = readClassRef();
|
cls.thisClass = readClassRef();
|
||||||
@ -416,11 +492,9 @@ class ClassReader {
|
|||||||
unknownAttrCommand);
|
unknownAttrCommand);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (a.layout() == Package.attrCodeEmpty ||
|
long pos0 = inPos; // in case we want to check it
|
||||||
a.layout() == Package.attrInnerClassesEmpty) {
|
if (a.layout() == Package.attrCodeEmpty) {
|
||||||
// These are hardwired.
|
// These are hardwired.
|
||||||
long pos0 = inPos;
|
|
||||||
if ("Code".equals(a.name())) {
|
|
||||||
Class.Method m = (Class.Method) h;
|
Class.Method m = (Class.Method) h;
|
||||||
m.code = new Code(m);
|
m.code = new Code(m);
|
||||||
try {
|
try {
|
||||||
@ -429,10 +503,18 @@ class ClassReader {
|
|||||||
String message = iie.getMessage() + " in " + h;
|
String message = iie.getMessage() + " in " + h;
|
||||||
throw new ClassReader.ClassFormatException(message, iie);
|
throw new ClassReader.ClassFormatException(message, iie);
|
||||||
}
|
}
|
||||||
} else {
|
assert(length == inPos - pos0);
|
||||||
|
// Keep empty attribute a...
|
||||||
|
} else if (a.layout() == Package.attrBootstrapMethodsEmpty) {
|
||||||
|
assert(h == cls);
|
||||||
|
readBootstrapMethods(cls);
|
||||||
|
assert(length == inPos - pos0);
|
||||||
|
// Delete the attribute; it is logically part of the constant pool.
|
||||||
|
continue;
|
||||||
|
} else if (a.layout() == Package.attrInnerClassesEmpty) {
|
||||||
|
// These are hardwired also.
|
||||||
assert(h == cls);
|
assert(h == cls);
|
||||||
readInnerClasses(cls);
|
readInnerClasses(cls);
|
||||||
}
|
|
||||||
assert(length == inPos - pos0);
|
assert(length == inPos - pos0);
|
||||||
// Keep empty attribute a...
|
// Keep empty attribute a...
|
||||||
} else if (length > 0) {
|
} else if (length > 0) {
|
||||||
@ -467,6 +549,19 @@ class ClassReader {
|
|||||||
readAttributes(ATTR_CONTEXT_CODE, code);
|
readAttributes(ATTR_CONTEXT_CODE, code);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void readBootstrapMethods(Class cls) throws IOException {
|
||||||
|
BootstrapMethodEntry[] bsms = new BootstrapMethodEntry[readUnsignedShort()];
|
||||||
|
for (int i = 0; i < bsms.length; i++) {
|
||||||
|
MethodHandleEntry bsmRef = (MethodHandleEntry) readRef(CONSTANT_MethodHandle);
|
||||||
|
Entry[] argRefs = new Entry[readUnsignedShort()];
|
||||||
|
for (int j = 0; j < argRefs.length; j++) {
|
||||||
|
argRefs[j] = readRef();
|
||||||
|
}
|
||||||
|
bsms[i] = ConstantPool.getBootstrapMethodEntry(bsmRef, argRefs);
|
||||||
|
}
|
||||||
|
cls.setBootstrapMethods(Arrays.asList(bsms));
|
||||||
|
}
|
||||||
|
|
||||||
void readInnerClasses(Class cls) throws IOException {
|
void readInnerClasses(Class cls) throws IOException {
|
||||||
int nc = readUnsignedShort();
|
int nc = readUnsignedShort();
|
||||||
ArrayList<InnerClass> ics = new ArrayList<>(nc);
|
ArrayList<InnerClass> ics = new ArrayList<>(nc);
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
|
* Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
|
||||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||||
*
|
*
|
||||||
* This code is free software; you can redistribute it and/or modify it
|
* This code is free software; you can redistribute it and/or modify it
|
||||||
@ -29,6 +29,8 @@ package com.sun.java.util.jar.pack;
|
|||||||
import com.sun.java.util.jar.pack.ConstantPool.Entry;
|
import com.sun.java.util.jar.pack.ConstantPool.Entry;
|
||||||
import com.sun.java.util.jar.pack.ConstantPool.Index;
|
import com.sun.java.util.jar.pack.ConstantPool.Index;
|
||||||
import com.sun.java.util.jar.pack.ConstantPool.NumberEntry;
|
import com.sun.java.util.jar.pack.ConstantPool.NumberEntry;
|
||||||
|
import com.sun.java.util.jar.pack.ConstantPool.MethodHandleEntry;
|
||||||
|
import com.sun.java.util.jar.pack.ConstantPool.BootstrapMethodEntry;
|
||||||
import com.sun.java.util.jar.pack.Package.Class;
|
import com.sun.java.util.jar.pack.Package.Class;
|
||||||
import com.sun.java.util.jar.pack.Package.InnerClass;
|
import com.sun.java.util.jar.pack.Package.InnerClass;
|
||||||
import java.io.BufferedOutputStream;
|
import java.io.BufferedOutputStream;
|
||||||
@ -49,6 +51,7 @@ class ClassWriter {
|
|||||||
Class cls;
|
Class cls;
|
||||||
DataOutputStream out;
|
DataOutputStream out;
|
||||||
Index cpIndex;
|
Index cpIndex;
|
||||||
|
Index bsmIndex;
|
||||||
|
|
||||||
ClassWriter(Class cls, OutputStream out) throws IOException {
|
ClassWriter(Class cls, OutputStream out) throws IOException {
|
||||||
this.pkg = cls.getPackage();
|
this.pkg = cls.getPackage();
|
||||||
@ -57,6 +60,10 @@ class ClassWriter {
|
|||||||
this.out = new DataOutputStream(new BufferedOutputStream(out));
|
this.out = new DataOutputStream(new BufferedOutputStream(out));
|
||||||
this.cpIndex = ConstantPool.makeIndex(cls.toString(), cls.getCPMap());
|
this.cpIndex = ConstantPool.makeIndex(cls.toString(), cls.getCPMap());
|
||||||
this.cpIndex.flattenSigs = true;
|
this.cpIndex.flattenSigs = true;
|
||||||
|
if (cls.hasBootstrapMethods()) {
|
||||||
|
this.bsmIndex = ConstantPool.makeIndex(cpIndex.debugName+".BootstrapMethods",
|
||||||
|
cls.getBootstrapMethodMap());
|
||||||
|
}
|
||||||
if (verbose > 1)
|
if (verbose > 1)
|
||||||
Utils.log.fine("local CP="+(verbose > 2 ? cpIndex.dumpString() : cpIndex.toString()));
|
Utils.log.fine("local CP="+(verbose > 2 ? cpIndex.dumpString() : cpIndex.toString()));
|
||||||
}
|
}
|
||||||
@ -71,6 +78,11 @@ class ClassWriter {
|
|||||||
|
|
||||||
/** Write a 2-byte int representing a CP entry, using the local cpIndex. */
|
/** Write a 2-byte int representing a CP entry, using the local cpIndex. */
|
||||||
private void writeRef(Entry e) throws IOException {
|
private void writeRef(Entry e) throws IOException {
|
||||||
|
writeRef(e, cpIndex);
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Write a 2-byte int representing a CP entry, using the given cpIndex. */
|
||||||
|
private void writeRef(Entry e, Index cpIndex) throws IOException {
|
||||||
int i = (e == null) ? 0 : cpIndex.indexOf(e);
|
int i = (e == null) ? 0 : cpIndex.indexOf(e);
|
||||||
writeShort(i);
|
writeShort(i);
|
||||||
}
|
}
|
||||||
@ -117,8 +129,7 @@ class ClassWriter {
|
|||||||
out.write(tag);
|
out.write(tag);
|
||||||
switch (tag) {
|
switch (tag) {
|
||||||
case CONSTANT_Signature:
|
case CONSTANT_Signature:
|
||||||
assert(false); // should not reach here
|
throw new AssertionError("CP should have Signatures remapped to Utf8");
|
||||||
break;
|
|
||||||
case CONSTANT_Utf8:
|
case CONSTANT_Utf8:
|
||||||
out.writeUTF(e.stringValue());
|
out.writeUTF(e.stringValue());
|
||||||
break;
|
break;
|
||||||
@ -138,8 +149,14 @@ class ClassWriter {
|
|||||||
break;
|
break;
|
||||||
case CONSTANT_Class:
|
case CONSTANT_Class:
|
||||||
case CONSTANT_String:
|
case CONSTANT_String:
|
||||||
|
case CONSTANT_MethodType:
|
||||||
writeRef(e.getRef(0));
|
writeRef(e.getRef(0));
|
||||||
break;
|
break;
|
||||||
|
case CONSTANT_MethodHandle:
|
||||||
|
MethodHandleEntry mhe = (MethodHandleEntry) e;
|
||||||
|
out.writeByte(mhe.refKind);
|
||||||
|
writeRef(mhe.getRef(0));
|
||||||
|
break;
|
||||||
case CONSTANT_Fieldref:
|
case CONSTANT_Fieldref:
|
||||||
case CONSTANT_Methodref:
|
case CONSTANT_Methodref:
|
||||||
case CONSTANT_InterfaceMethodref:
|
case CONSTANT_InterfaceMethodref:
|
||||||
@ -147,6 +164,12 @@ class ClassWriter {
|
|||||||
writeRef(e.getRef(0));
|
writeRef(e.getRef(0));
|
||||||
writeRef(e.getRef(1));
|
writeRef(e.getRef(1));
|
||||||
break;
|
break;
|
||||||
|
case CONSTANT_InvokeDynamic:
|
||||||
|
writeRef(e.getRef(0), bsmIndex);
|
||||||
|
writeRef(e.getRef(1));
|
||||||
|
break;
|
||||||
|
case CONSTANT_BootstrapMethod:
|
||||||
|
throw new AssertionError("CP should have BootstrapMethods moved to side-table");
|
||||||
default:
|
default:
|
||||||
throw new IOException("Bad constant pool tag "+tag);
|
throw new IOException("Bad constant pool tag "+tag);
|
||||||
}
|
}
|
||||||
@ -198,6 +221,7 @@ class ClassWriter {
|
|||||||
a.finishRefs(cpIndex);
|
a.finishRefs(cpIndex);
|
||||||
writeRef(a.getNameRef());
|
writeRef(a.getNameRef());
|
||||||
if (a.layout() == Package.attrCodeEmpty ||
|
if (a.layout() == Package.attrCodeEmpty ||
|
||||||
|
a.layout() == Package.attrBootstrapMethodsEmpty ||
|
||||||
a.layout() == Package.attrInnerClassesEmpty) {
|
a.layout() == Package.attrInnerClassesEmpty) {
|
||||||
// These are hardwired.
|
// These are hardwired.
|
||||||
DataOutputStream savedOut = out;
|
DataOutputStream savedOut = out;
|
||||||
@ -207,9 +231,14 @@ class ClassWriter {
|
|||||||
if ("Code".equals(a.name())) {
|
if ("Code".equals(a.name())) {
|
||||||
Class.Method m = (Class.Method) h;
|
Class.Method m = (Class.Method) h;
|
||||||
writeCode(m.code);
|
writeCode(m.code);
|
||||||
} else {
|
} else if ("BootstrapMethods".equals(a.name())) {
|
||||||
|
assert(h == cls);
|
||||||
|
writeBootstrapMethods(cls);
|
||||||
|
} else if ("InnerClasses".equals(a.name())) {
|
||||||
assert(h == cls);
|
assert(h == cls);
|
||||||
writeInnerClasses(cls);
|
writeInnerClasses(cls);
|
||||||
|
} else {
|
||||||
|
throw new AssertionError();
|
||||||
}
|
}
|
||||||
out = savedOut;
|
out = savedOut;
|
||||||
if (verbose > 2)
|
if (verbose > 2)
|
||||||
@ -242,6 +271,18 @@ class ClassWriter {
|
|||||||
writeAttributes(ATTR_CONTEXT_CODE, code);
|
writeAttributes(ATTR_CONTEXT_CODE, code);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void writeBootstrapMethods(Class cls) throws IOException {
|
||||||
|
List<BootstrapMethodEntry> bsms = cls.getBootstrapMethods();
|
||||||
|
writeShort(bsms.size());
|
||||||
|
for (BootstrapMethodEntry e : bsms) {
|
||||||
|
writeRef(e.bsmRef);
|
||||||
|
writeShort(e.argRefs.length);
|
||||||
|
for (Entry argRef : e.argRefs) {
|
||||||
|
writeRef(argRef);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
void writeInnerClasses(Class cls) throws IOException {
|
void writeInnerClasses(Class cls) throws IOException {
|
||||||
List<InnerClass> ics = cls.getInnerClasses();
|
List<InnerClass> ics = cls.getInnerClasses();
|
||||||
writeShort(ics.size());
|
writeShort(ics.size());
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
|
* Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
|
||||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||||
*
|
*
|
||||||
* This code is free software; you can redistribute it and/or modify it
|
* This code is free software; you can redistribute it and/or modify it
|
||||||
@ -52,7 +52,7 @@ class ConstantPool {
|
|||||||
* Also used to back up more complex constant pool entries, like Class.
|
* Also used to back up more complex constant pool entries, like Class.
|
||||||
*/
|
*/
|
||||||
public static synchronized Utf8Entry getUtf8Entry(String value) {
|
public static synchronized Utf8Entry getUtf8Entry(String value) {
|
||||||
Map<String, Utf8Entry> utf8Entries = Utils.getUtf8Entries();
|
Map<String, Utf8Entry> utf8Entries = Utils.getTLGlobals().getUtf8Entries();
|
||||||
Utf8Entry e = utf8Entries.get(value);
|
Utf8Entry e = utf8Entries.get(value);
|
||||||
if (e == null) {
|
if (e == null) {
|
||||||
e = new Utf8Entry(value);
|
e = new Utf8Entry(value);
|
||||||
@ -61,8 +61,8 @@ class ConstantPool {
|
|||||||
return e;
|
return e;
|
||||||
}
|
}
|
||||||
/** Factory for Class constants. */
|
/** Factory for Class constants. */
|
||||||
public static synchronized ClassEntry getClassEntry(String name) {
|
public static ClassEntry getClassEntry(String name) {
|
||||||
Map<String, ClassEntry> classEntries = Utils.getClassEntries();
|
Map<String, ClassEntry> classEntries = Utils.getTLGlobals().getClassEntries();
|
||||||
ClassEntry e = classEntries.get(name);
|
ClassEntry e = classEntries.get(name);
|
||||||
if (e == null) {
|
if (e == null) {
|
||||||
e = new ClassEntry(getUtf8Entry(name));
|
e = new ClassEntry(getUtf8Entry(name));
|
||||||
@ -72,8 +72,8 @@ class ConstantPool {
|
|||||||
return e;
|
return e;
|
||||||
}
|
}
|
||||||
/** Factory for literal constants (String, Integer, etc.). */
|
/** Factory for literal constants (String, Integer, etc.). */
|
||||||
public static synchronized LiteralEntry getLiteralEntry(Comparable<?> value) {
|
public static LiteralEntry getLiteralEntry(Comparable<?> value) {
|
||||||
Map<Object, LiteralEntry> literalEntries = Utils.getLiteralEntries();
|
Map<Object, LiteralEntry> literalEntries = Utils.getTLGlobals().getLiteralEntries();
|
||||||
LiteralEntry e = literalEntries.get(value);
|
LiteralEntry e = literalEntries.get(value);
|
||||||
if (e == null) {
|
if (e == null) {
|
||||||
if (value instanceof String)
|
if (value instanceof String)
|
||||||
@ -85,13 +85,13 @@ class ConstantPool {
|
|||||||
return e;
|
return e;
|
||||||
}
|
}
|
||||||
/** Factory for literal constants (String, Integer, etc.). */
|
/** Factory for literal constants (String, Integer, etc.). */
|
||||||
public static synchronized StringEntry getStringEntry(String value) {
|
public static StringEntry getStringEntry(String value) {
|
||||||
return (StringEntry) getLiteralEntry(value);
|
return (StringEntry) getLiteralEntry(value);
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Factory for signature (type) constants. */
|
/** Factory for signature (type) constants. */
|
||||||
public static synchronized SignatureEntry getSignatureEntry(String type) {
|
public static SignatureEntry getSignatureEntry(String type) {
|
||||||
Map<String, SignatureEntry> signatureEntries = Utils.getSignatureEntries();
|
Map<String, SignatureEntry> signatureEntries = Utils.getTLGlobals().getSignatureEntries();
|
||||||
SignatureEntry e = signatureEntries.get(type);
|
SignatureEntry e = signatureEntries.get(type);
|
||||||
if (e == null) {
|
if (e == null) {
|
||||||
e = new SignatureEntry(type);
|
e = new SignatureEntry(type);
|
||||||
@ -106,8 +106,8 @@ class ConstantPool {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/** Factory for descriptor (name-and-type) constants. */
|
/** Factory for descriptor (name-and-type) constants. */
|
||||||
public static synchronized DescriptorEntry getDescriptorEntry(Utf8Entry nameRef, SignatureEntry typeRef) {
|
public static DescriptorEntry getDescriptorEntry(Utf8Entry nameRef, SignatureEntry typeRef) {
|
||||||
Map<String, DescriptorEntry> descriptorEntries = Utils.getDescriptorEntries();
|
Map<String, DescriptorEntry> descriptorEntries = Utils.getTLGlobals().getDescriptorEntries();
|
||||||
String key = DescriptorEntry.stringValueOf(nameRef, typeRef);
|
String key = DescriptorEntry.stringValueOf(nameRef, typeRef);
|
||||||
DescriptorEntry e = descriptorEntries.get(key);
|
DescriptorEntry e = descriptorEntries.get(key);
|
||||||
if (e == null) {
|
if (e == null) {
|
||||||
@ -124,8 +124,8 @@ class ConstantPool {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/** Factory for member reference constants. */
|
/** Factory for member reference constants. */
|
||||||
public static synchronized MemberEntry getMemberEntry(byte tag, ClassEntry classRef, DescriptorEntry descRef) {
|
public static MemberEntry getMemberEntry(byte tag, ClassEntry classRef, DescriptorEntry descRef) {
|
||||||
Map<String, MemberEntry> memberEntries = Utils.getMemberEntries();
|
Map<String, MemberEntry> memberEntries = Utils.getTLGlobals().getMemberEntries();
|
||||||
String key = MemberEntry.stringValueOf(tag, classRef, descRef);
|
String key = MemberEntry.stringValueOf(tag, classRef, descRef);
|
||||||
MemberEntry e = memberEntries.get(key);
|
MemberEntry e = memberEntries.get(key);
|
||||||
if (e == null) {
|
if (e == null) {
|
||||||
@ -137,6 +137,61 @@ class ConstantPool {
|
|||||||
return e;
|
return e;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** Factory for MethodHandle constants. */
|
||||||
|
public static MethodHandleEntry getMethodHandleEntry(byte refKind, MemberEntry memRef) {
|
||||||
|
Map<String, MethodHandleEntry> methodHandleEntries = Utils.getTLGlobals().getMethodHandleEntries();
|
||||||
|
String key = MethodHandleEntry.stringValueOf(refKind, memRef);
|
||||||
|
MethodHandleEntry e = methodHandleEntries.get(key);
|
||||||
|
if (e == null) {
|
||||||
|
e = new MethodHandleEntry(refKind, memRef);
|
||||||
|
assert(e.stringValue().equals(key));
|
||||||
|
methodHandleEntries.put(key, e);
|
||||||
|
}
|
||||||
|
return e;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Factory for MethodType constants. */
|
||||||
|
public static MethodTypeEntry getMethodTypeEntry(SignatureEntry sigRef) {
|
||||||
|
Map<String, MethodTypeEntry> methodTypeEntries = Utils.getTLGlobals().getMethodTypeEntries();
|
||||||
|
String key = sigRef.stringValue();
|
||||||
|
MethodTypeEntry e = methodTypeEntries.get(key);
|
||||||
|
if (e == null) {
|
||||||
|
e = new MethodTypeEntry(sigRef);
|
||||||
|
assert(e.stringValue().equals(key));
|
||||||
|
methodTypeEntries.put(key, e);
|
||||||
|
}
|
||||||
|
return e;
|
||||||
|
}
|
||||||
|
public static MethodTypeEntry getMethodTypeEntry(Utf8Entry typeRef) {
|
||||||
|
return getMethodTypeEntry(getSignatureEntry(typeRef.stringValue()));
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Factory for InvokeDynamic constants. */
|
||||||
|
public static InvokeDynamicEntry getInvokeDynamicEntry(BootstrapMethodEntry bssRef, DescriptorEntry descRef) {
|
||||||
|
Map<String, InvokeDynamicEntry> invokeDynamicEntries = Utils.getTLGlobals().getInvokeDynamicEntries();
|
||||||
|
String key = InvokeDynamicEntry.stringValueOf(bssRef, descRef);
|
||||||
|
InvokeDynamicEntry e = invokeDynamicEntries.get(key);
|
||||||
|
if (e == null) {
|
||||||
|
e = new InvokeDynamicEntry(bssRef, descRef);
|
||||||
|
assert(e.stringValue().equals(key));
|
||||||
|
invokeDynamicEntries.put(key, e);
|
||||||
|
}
|
||||||
|
return e;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Factory for BootstrapMethod pseudo-constants. */
|
||||||
|
public static BootstrapMethodEntry getBootstrapMethodEntry(MethodHandleEntry bsmRef, Entry[] argRefs) {
|
||||||
|
Map<String, BootstrapMethodEntry> bootstrapMethodEntries = Utils.getTLGlobals().getBootstrapMethodEntries();
|
||||||
|
String key = BootstrapMethodEntry.stringValueOf(bsmRef, argRefs);
|
||||||
|
BootstrapMethodEntry e = bootstrapMethodEntries.get(key);
|
||||||
|
if (e == null) {
|
||||||
|
e = new BootstrapMethodEntry(bsmRef, argRefs);
|
||||||
|
assert(e.stringValue().equals(key));
|
||||||
|
bootstrapMethodEntries.put(key, e);
|
||||||
|
}
|
||||||
|
return e;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
/** Entries in the constant pool. */
|
/** Entries in the constant pool. */
|
||||||
public static abstract
|
public static abstract
|
||||||
@ -251,6 +306,10 @@ class ConstantPool {
|
|||||||
throw new RuntimeException("bad literal value "+value);
|
throw new RuntimeException("bad literal value "+value);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static boolean isRefKind(byte refKind) {
|
||||||
|
return (REF_getField <= refKind && refKind <= REF_invokeInterface);
|
||||||
|
}
|
||||||
|
|
||||||
public static abstract
|
public static abstract
|
||||||
class LiteralEntry extends Entry {
|
class LiteralEntry extends Entry {
|
||||||
protected LiteralEntry(byte tag) {
|
protected LiteralEntry(byte tag) {
|
||||||
@ -404,7 +463,7 @@ class ConstantPool {
|
|||||||
}
|
}
|
||||||
static
|
static
|
||||||
String stringValueOf(Entry nameRef, Entry typeRef) {
|
String stringValueOf(Entry nameRef, Entry typeRef) {
|
||||||
return typeRef.stringValue()+","+nameRef.stringValue();
|
return qualifiedStringValue(typeRef, nameRef);
|
||||||
}
|
}
|
||||||
|
|
||||||
public String prettyString() {
|
public String prettyString() {
|
||||||
@ -420,6 +479,15 @@ class ConstantPool {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static String qualifiedStringValue(Entry e1, Entry e2) {
|
||||||
|
return qualifiedStringValue(e1.stringValue(), e2.stringValue());
|
||||||
|
}
|
||||||
|
static String qualifiedStringValue(String s1, String s234) {
|
||||||
|
// Qualification by dot must decompose uniquely. Second string might already be qualified.
|
||||||
|
assert(s1.indexOf(".") < 0);
|
||||||
|
return s1+"."+s234;
|
||||||
|
}
|
||||||
|
|
||||||
public static
|
public static
|
||||||
class MemberEntry extends Entry {
|
class MemberEntry extends Entry {
|
||||||
final ClassEntry classRef;
|
final ClassEntry classRef;
|
||||||
@ -453,7 +521,11 @@ class ConstantPool {
|
|||||||
int x = superCompareTo(o);
|
int x = superCompareTo(o);
|
||||||
if (x == 0) {
|
if (x == 0) {
|
||||||
MemberEntry that = (MemberEntry)o;
|
MemberEntry that = (MemberEntry)o;
|
||||||
|
if (Utils.SORT_MEMBERS_DESCR_MAJOR)
|
||||||
|
// descRef is transmitted as UDELTA5; sort it first?
|
||||||
|
x = this.descRef.compareTo(that.descRef);
|
||||||
// Primary key is classRef.
|
// Primary key is classRef.
|
||||||
|
if (x == 0)
|
||||||
x = this.classRef.compareTo(that.classRef);
|
x = this.classRef.compareTo(that.classRef);
|
||||||
if (x == 0)
|
if (x == 0)
|
||||||
x = this.descRef.compareTo(that.descRef);
|
x = this.descRef.compareTo(that.descRef);
|
||||||
@ -473,7 +545,7 @@ class ConstantPool {
|
|||||||
case CONSTANT_InterfaceMethodref: pfx = "IMethod:"; break;
|
case CONSTANT_InterfaceMethodref: pfx = "IMethod:"; break;
|
||||||
default: pfx = tag+"???"; break;
|
default: pfx = tag+"???"; break;
|
||||||
}
|
}
|
||||||
return pfx+classRef.stringValue()+","+descRef.stringValue();
|
return pfx+qualifiedStringValue(classRef, descRef);
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean isMethod() {
|
public boolean isMethod() {
|
||||||
@ -581,13 +653,26 @@ class ConstantPool {
|
|||||||
}
|
}
|
||||||
public byte getLiteralTag() {
|
public byte getLiteralTag() {
|
||||||
switch (formRef.stringValue().charAt(0)) {
|
switch (formRef.stringValue().charAt(0)) {
|
||||||
case 'L': return CONSTANT_String;
|
|
||||||
case 'I': return CONSTANT_Integer;
|
case 'I': return CONSTANT_Integer;
|
||||||
case 'J': return CONSTANT_Long;
|
case 'J': return CONSTANT_Long;
|
||||||
case 'F': return CONSTANT_Float;
|
case 'F': return CONSTANT_Float;
|
||||||
case 'D': return CONSTANT_Double;
|
case 'D': return CONSTANT_Double;
|
||||||
case 'B': case 'S': case 'C': case 'Z':
|
case 'B': case 'S': case 'C': case 'Z':
|
||||||
return CONSTANT_Integer;
|
return CONSTANT_Integer;
|
||||||
|
case 'L':
|
||||||
|
/*
|
||||||
|
switch (classRefs[0].stringValue()) {
|
||||||
|
case "java/lang/String":
|
||||||
|
return CONSTANT_String;
|
||||||
|
case "java/lang/invoke/MethodHandle":
|
||||||
|
return CONSTANT_MethodHandle;
|
||||||
|
case "java/lang/invoke/MethodType":
|
||||||
|
return CONSTANT_MethodType;
|
||||||
|
default: // java/lang/Object, etc.
|
||||||
|
return CONSTANT_LoadableValue;
|
||||||
|
}
|
||||||
|
*/
|
||||||
|
return CONSTANT_String; // JDK 7 ConstantValue limited to String
|
||||||
}
|
}
|
||||||
assert(false);
|
assert(false);
|
||||||
return CONSTANT_None;
|
return CONSTANT_None;
|
||||||
@ -724,6 +809,218 @@ class ConstantPool {
|
|||||||
return parts;
|
return parts;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** @since JDK 7, JSR 292 */
|
||||||
|
public static
|
||||||
|
class MethodHandleEntry extends Entry {
|
||||||
|
final int refKind;
|
||||||
|
final MemberEntry memRef;
|
||||||
|
public Entry getRef(int i) { return i == 0 ? memRef : null; }
|
||||||
|
|
||||||
|
protected int computeValueHash() {
|
||||||
|
int hc2 = refKind;
|
||||||
|
return (memRef.hashCode() + (hc2 << 8)) ^ hc2;
|
||||||
|
}
|
||||||
|
|
||||||
|
MethodHandleEntry(byte refKind, MemberEntry memRef) {
|
||||||
|
super(CONSTANT_MethodHandle);
|
||||||
|
assert(isRefKind(refKind));
|
||||||
|
this.refKind = refKind;
|
||||||
|
this.memRef = memRef;
|
||||||
|
hashCode(); // force computation of valueHash
|
||||||
|
}
|
||||||
|
public boolean equals(Object o) {
|
||||||
|
if (o == null || o.getClass() != MethodHandleEntry.class) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
MethodHandleEntry that = (MethodHandleEntry)o;
|
||||||
|
return this.refKind == that.refKind
|
||||||
|
&& this.memRef.eq(that.memRef);
|
||||||
|
}
|
||||||
|
public int compareTo(Object o) {
|
||||||
|
int x = superCompareTo(o);
|
||||||
|
if (x == 0) {
|
||||||
|
MethodHandleEntry that = (MethodHandleEntry)o;
|
||||||
|
if (Utils.SORT_HANDLES_KIND_MAJOR)
|
||||||
|
// Primary key could be refKind.
|
||||||
|
x = this.refKind - that.refKind;
|
||||||
|
// Primary key is memRef, which is transmitted as UDELTA5.
|
||||||
|
if (x == 0)
|
||||||
|
x = this.memRef.compareTo(that.memRef);
|
||||||
|
if (x == 0)
|
||||||
|
x = this.refKind - that.refKind;
|
||||||
|
}
|
||||||
|
return x;
|
||||||
|
}
|
||||||
|
public static String stringValueOf(int refKind, MemberEntry memRef) {
|
||||||
|
return refKindName(refKind)+":"+memRef.stringValue();
|
||||||
|
}
|
||||||
|
public String stringValue() {
|
||||||
|
return stringValueOf(refKind, memRef);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/** @since JDK 7, JSR 292 */
|
||||||
|
public static
|
||||||
|
class MethodTypeEntry extends Entry {
|
||||||
|
final SignatureEntry typeRef;
|
||||||
|
public Entry getRef(int i) { return i == 0 ? typeRef : null; }
|
||||||
|
|
||||||
|
protected int computeValueHash() {
|
||||||
|
return typeRef.hashCode() + tag;
|
||||||
|
}
|
||||||
|
|
||||||
|
MethodTypeEntry(SignatureEntry typeRef) {
|
||||||
|
super(CONSTANT_MethodType);
|
||||||
|
this.typeRef = typeRef;
|
||||||
|
hashCode(); // force computation of valueHash
|
||||||
|
}
|
||||||
|
public boolean equals(Object o) {
|
||||||
|
if (o == null || o.getClass() != MethodTypeEntry.class) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
MethodTypeEntry that = (MethodTypeEntry)o;
|
||||||
|
return this.typeRef.eq(that.typeRef);
|
||||||
|
}
|
||||||
|
public int compareTo(Object o) {
|
||||||
|
int x = superCompareTo(o);
|
||||||
|
if (x == 0) {
|
||||||
|
MethodTypeEntry that = (MethodTypeEntry)o;
|
||||||
|
x = this.typeRef.compareTo(that.typeRef);
|
||||||
|
}
|
||||||
|
return x;
|
||||||
|
}
|
||||||
|
public String stringValue() {
|
||||||
|
return typeRef.stringValue();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/** @since JDK 7, JSR 292 */
|
||||||
|
public static
|
||||||
|
class InvokeDynamicEntry extends Entry {
|
||||||
|
final BootstrapMethodEntry bssRef;
|
||||||
|
final DescriptorEntry descRef;
|
||||||
|
public Entry getRef(int i) {
|
||||||
|
if (i == 0) return bssRef;
|
||||||
|
if (i == 1) return descRef;
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
protected int computeValueHash() {
|
||||||
|
int hc2 = descRef.hashCode();
|
||||||
|
return (bssRef.hashCode() + (hc2 << 8)) ^ hc2;
|
||||||
|
}
|
||||||
|
|
||||||
|
InvokeDynamicEntry(BootstrapMethodEntry bssRef, DescriptorEntry descRef) {
|
||||||
|
super(CONSTANT_InvokeDynamic);
|
||||||
|
this.bssRef = bssRef;
|
||||||
|
this.descRef = descRef;
|
||||||
|
hashCode(); // force computation of valueHash
|
||||||
|
}
|
||||||
|
public boolean equals(Object o) {
|
||||||
|
if (o == null || o.getClass() != InvokeDynamicEntry.class) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
InvokeDynamicEntry that = (InvokeDynamicEntry)o;
|
||||||
|
return this.bssRef.eq(that.bssRef)
|
||||||
|
&& this.descRef.eq(that.descRef);
|
||||||
|
}
|
||||||
|
public int compareTo(Object o) {
|
||||||
|
int x = superCompareTo(o);
|
||||||
|
if (x == 0) {
|
||||||
|
InvokeDynamicEntry that = (InvokeDynamicEntry)o;
|
||||||
|
if (Utils.SORT_INDY_BSS_MAJOR)
|
||||||
|
// Primary key could be bsmRef.
|
||||||
|
x = this.bssRef.compareTo(that.bssRef);
|
||||||
|
// Primary key is descriptor, which is transmitted as UDELTA5.
|
||||||
|
if (x == 0)
|
||||||
|
x = this.descRef.compareTo(that.descRef);
|
||||||
|
if (x == 0)
|
||||||
|
x = this.bssRef.compareTo(that.bssRef);
|
||||||
|
}
|
||||||
|
return x;
|
||||||
|
}
|
||||||
|
public String stringValue() {
|
||||||
|
return stringValueOf(bssRef, descRef);
|
||||||
|
}
|
||||||
|
static
|
||||||
|
String stringValueOf(BootstrapMethodEntry bssRef, DescriptorEntry descRef) {
|
||||||
|
return "Indy:"+bssRef.stringValue()+"."+descRef.stringValue();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/** @since JDK 7, JSR 292 */
|
||||||
|
public static
|
||||||
|
class BootstrapMethodEntry extends Entry {
|
||||||
|
final MethodHandleEntry bsmRef;
|
||||||
|
final Entry[] argRefs;
|
||||||
|
public Entry getRef(int i) {
|
||||||
|
if (i == 0) return bsmRef;
|
||||||
|
if (i-1 < argRefs.length) return argRefs[i-1];
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
protected int computeValueHash() {
|
||||||
|
int hc2 = bsmRef.hashCode();
|
||||||
|
return (Arrays.hashCode(argRefs) + (hc2 << 8)) ^ hc2;
|
||||||
|
}
|
||||||
|
|
||||||
|
BootstrapMethodEntry(MethodHandleEntry bsmRef, Entry[] argRefs) {
|
||||||
|
super(CONSTANT_BootstrapMethod);
|
||||||
|
this.bsmRef = bsmRef;
|
||||||
|
this.argRefs = argRefs.clone();
|
||||||
|
hashCode(); // force computation of valueHash
|
||||||
|
}
|
||||||
|
public boolean equals(Object o) {
|
||||||
|
if (o == null || o.getClass() != BootstrapMethodEntry.class) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
BootstrapMethodEntry that = (BootstrapMethodEntry)o;
|
||||||
|
return this.bsmRef.eq(that.bsmRef)
|
||||||
|
&& Arrays.equals(this.argRefs, that.argRefs);
|
||||||
|
}
|
||||||
|
public int compareTo(Object o) {
|
||||||
|
int x = superCompareTo(o);
|
||||||
|
if (x == 0) {
|
||||||
|
BootstrapMethodEntry that = (BootstrapMethodEntry)o;
|
||||||
|
if (Utils.SORT_BSS_BSM_MAJOR)
|
||||||
|
// Primary key is bsmRef.
|
||||||
|
x = this.bsmRef.compareTo(that.bsmRef);
|
||||||
|
// Primary key is args array length, which is transmitted as UDELTA5.
|
||||||
|
if (x == 0)
|
||||||
|
x = compareArgArrays(this.argRefs, that.argRefs);
|
||||||
|
if (x == 0)
|
||||||
|
x = this.bsmRef.compareTo(that.bsmRef);
|
||||||
|
}
|
||||||
|
return x;
|
||||||
|
}
|
||||||
|
public String stringValue() {
|
||||||
|
return stringValueOf(bsmRef, argRefs);
|
||||||
|
}
|
||||||
|
static
|
||||||
|
String stringValueOf(MethodHandleEntry bsmRef, Entry[] argRefs) {
|
||||||
|
StringBuffer sb = new StringBuffer(bsmRef.stringValue());
|
||||||
|
// Arguments are formatted as "<foo;bar;baz>" instead of "[foo,bar,baz]".
|
||||||
|
// This ensures there will be no confusion if "[,]" appear inside of names.
|
||||||
|
char nextSep = '<';
|
||||||
|
boolean didOne = false;
|
||||||
|
for (Entry argRef : argRefs) {
|
||||||
|
sb.append(nextSep).append(argRef.stringValue());
|
||||||
|
nextSep = ';';
|
||||||
|
}
|
||||||
|
if (nextSep == '<') sb.append(nextSep);
|
||||||
|
sb.append('>');
|
||||||
|
return sb.toString();
|
||||||
|
}
|
||||||
|
static
|
||||||
|
int compareArgArrays(Entry[] a1, Entry[] a2) {
|
||||||
|
int x = a1.length - a2.length;
|
||||||
|
if (x != 0) return x;
|
||||||
|
for (int i = 0; i < a1.length; i++) {
|
||||||
|
x = a1[i].compareTo(a2[i]);
|
||||||
|
if (x != 0) break;
|
||||||
|
}
|
||||||
|
return x;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// Handy constants:
|
// Handy constants:
|
||||||
protected static final Entry[] noRefs = {};
|
protected static final Entry[] noRefs = {};
|
||||||
protected static final ClassEntry[] noClassRefs = {};
|
protected static final ClassEntry[] noClassRefs = {};
|
||||||
@ -964,35 +1261,51 @@ class ConstantPool {
|
|||||||
/** Coherent group of constant pool indexes. */
|
/** Coherent group of constant pool indexes. */
|
||||||
public static
|
public static
|
||||||
class IndexGroup {
|
class IndexGroup {
|
||||||
private Index indexUntyped;
|
|
||||||
private Index[] indexByTag = new Index[CONSTANT_Limit];
|
private Index[] indexByTag = new Index[CONSTANT_Limit];
|
||||||
|
private Index[] indexByTagGroup;
|
||||||
private int[] untypedFirstIndexByTag;
|
private int[] untypedFirstIndexByTag;
|
||||||
private int totalSize;
|
private int totalSizeQQ;
|
||||||
private Index[][] indexByTagAndClass;
|
private Index[][] indexByTagAndClass;
|
||||||
|
|
||||||
/** Index of all CP entries of all types, in definition order. */
|
/** Index of all CP entries of all types, in definition order. */
|
||||||
public Index getUntypedIndex() {
|
private Index makeTagGroupIndex(byte tagGroupTag, byte[] tagsInGroup) {
|
||||||
if (indexUntyped == null) {
|
if (indexByTagGroup == null)
|
||||||
|
indexByTagGroup = new Index[CONSTANT_GroupLimit - CONSTANT_GroupFirst];
|
||||||
|
int which = tagGroupTag - CONSTANT_GroupFirst;
|
||||||
|
assert(indexByTagGroup[which] == null);
|
||||||
|
int fillp = 0;
|
||||||
|
Entry[] cpMap = null;
|
||||||
|
for (int pass = 1; pass <= 2; pass++) {
|
||||||
untypedIndexOf(null); // warm up untypedFirstIndexByTag
|
untypedIndexOf(null); // warm up untypedFirstIndexByTag
|
||||||
Entry[] cpMap = new Entry[totalSize];
|
for (byte tag : tagsInGroup) {
|
||||||
for (int tag = 0; tag < indexByTag.length; tag++) {
|
|
||||||
Index ix = indexByTag[tag];
|
Index ix = indexByTag[tag];
|
||||||
if (ix == null) continue;
|
if (ix == null) continue;
|
||||||
int ixLen = ix.cpMap.length;
|
int ixLen = ix.cpMap.length;
|
||||||
if (ixLen == 0) continue;
|
if (ixLen == 0) continue;
|
||||||
int fillp = untypedFirstIndexByTag[tag];
|
assert(tagGroupTag == CONSTANT_All
|
||||||
|
? fillp == untypedFirstIndexByTag[tag]
|
||||||
|
: fillp < untypedFirstIndexByTag[tag]);
|
||||||
|
if (cpMap != null) {
|
||||||
assert(cpMap[fillp] == null);
|
assert(cpMap[fillp] == null);
|
||||||
assert(cpMap[fillp+ixLen-1] == null);
|
assert(cpMap[fillp+ixLen-1] == null);
|
||||||
System.arraycopy(ix.cpMap, 0, cpMap, fillp, ixLen);
|
System.arraycopy(ix.cpMap, 0, cpMap, fillp, ixLen);
|
||||||
}
|
}
|
||||||
indexUntyped = new Index("untyped", cpMap);
|
fillp += ixLen;
|
||||||
}
|
}
|
||||||
return indexUntyped;
|
if (cpMap == null) {
|
||||||
|
assert(pass == 1);
|
||||||
|
// get ready for pass 2
|
||||||
|
cpMap = new Entry[fillp];
|
||||||
|
fillp = 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
indexByTagGroup[which] = new Index(tagName(tagGroupTag), cpMap);
|
||||||
|
return indexByTagGroup[which];
|
||||||
}
|
}
|
||||||
|
|
||||||
public int untypedIndexOf(Entry e) {
|
public int untypedIndexOf(Entry e) {
|
||||||
if (untypedFirstIndexByTag == null) {
|
if (untypedFirstIndexByTag == null) {
|
||||||
untypedFirstIndexByTag = new int[CONSTANT_Limit];
|
untypedFirstIndexByTag = new int[CONSTANT_Limit+1];
|
||||||
int fillp = 0;
|
int fillp = 0;
|
||||||
for (int i = 0; i < TAGS_IN_ORDER.length; i++) {
|
for (int i = 0; i < TAGS_IN_ORDER.length; i++) {
|
||||||
byte tag = TAGS_IN_ORDER[i];
|
byte tag = TAGS_IN_ORDER[i];
|
||||||
@ -1002,7 +1315,7 @@ class ConstantPool {
|
|||||||
untypedFirstIndexByTag[tag] = fillp;
|
untypedFirstIndexByTag[tag] = fillp;
|
||||||
fillp += ixLen;
|
fillp += ixLen;
|
||||||
}
|
}
|
||||||
totalSize = fillp;
|
untypedFirstIndexByTag[CONSTANT_Limit] = fillp;
|
||||||
}
|
}
|
||||||
if (e == null) return -1;
|
if (e == null) return -1;
|
||||||
int tag = e.tag;
|
int tag = e.tag;
|
||||||
@ -1028,16 +1341,15 @@ class ConstantPool {
|
|||||||
indexByTag[tag] = ix;
|
indexByTag[tag] = ix;
|
||||||
// decache indexes derived from this one:
|
// decache indexes derived from this one:
|
||||||
untypedFirstIndexByTag = null;
|
untypedFirstIndexByTag = null;
|
||||||
indexUntyped = null;
|
indexByTagGroup = null;
|
||||||
if (indexByTagAndClass != null)
|
if (indexByTagAndClass != null)
|
||||||
indexByTagAndClass[tag] = null;
|
indexByTagAndClass[tag] = null;
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Index of all CP entries of a given tag. */
|
/** Index of all CP entries of a given tag. */
|
||||||
public Index getIndexByTag(byte tag) {
|
public Index getIndexByTag(byte tag) {
|
||||||
if (tag == CONSTANT_All) {
|
if (tag >= CONSTANT_GroupFirst)
|
||||||
return getUntypedIndex();
|
return getIndexByTagGroup(tag);
|
||||||
}
|
|
||||||
Index ix = indexByTag[tag];
|
Index ix = indexByTag[tag];
|
||||||
if (ix == null) {
|
if (ix == null) {
|
||||||
// Make an empty one by default.
|
// Make an empty one by default.
|
||||||
@ -1047,6 +1359,26 @@ class ConstantPool {
|
|||||||
return ix;
|
return ix;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private Index getIndexByTagGroup(byte tag) {
|
||||||
|
// pool groups:
|
||||||
|
if (indexByTagGroup != null) {
|
||||||
|
Index ix = indexByTagGroup[tag - CONSTANT_GroupFirst];
|
||||||
|
if (ix != null) return ix;
|
||||||
|
}
|
||||||
|
switch (tag) {
|
||||||
|
case CONSTANT_All:
|
||||||
|
return makeTagGroupIndex(CONSTANT_All, TAGS_IN_ORDER);
|
||||||
|
case CONSTANT_LoadableValue:
|
||||||
|
return makeTagGroupIndex(CONSTANT_LoadableValue, LOADABLE_VALUE_TAGS);
|
||||||
|
case CONSTANT_AnyMember:
|
||||||
|
return makeTagGroupIndex(CONSTANT_AnyMember, ANY_MEMBER_TAGS);
|
||||||
|
case CONSTANT_FieldSpecific:
|
||||||
|
// This one does not have any fixed index, since it is context-specific.
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
throw new AssertionError("bad tag group "+tag);
|
||||||
|
}
|
||||||
|
|
||||||
/** Index of all CP entries of a given tag and class. */
|
/** Index of all CP entries of a given tag and class. */
|
||||||
public Index getMemberIndex(byte tag, ClassEntry classRef) {
|
public Index getMemberIndex(byte tag, ClassEntry classRef) {
|
||||||
if (indexByTagAndClass == null)
|
if (indexByTagAndClass == null)
|
||||||
@ -1107,16 +1439,14 @@ class ConstantPool {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public boolean haveNumbers() {
|
public boolean haveNumbers() {
|
||||||
for (byte tag = CONSTANT_Integer; tag <= CONSTANT_Double; tag++) {
|
for (byte tag : NUMBER_TAGS) {
|
||||||
switch (tag) {
|
if (getIndexByTag(tag).size() > 0) return true;
|
||||||
case CONSTANT_Integer:
|
|
||||||
case CONSTANT_Float:
|
|
||||||
case CONSTANT_Long:
|
|
||||||
case CONSTANT_Double:
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
assert(false);
|
|
||||||
}
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
public boolean haveExtraTags() {
|
||||||
|
for (byte tag : EXTRA_TAGS) {
|
||||||
if (getIndexByTag(tag).size() > 0) return true;
|
if (getIndexByTag(tag).size() > 0) return true;
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
@ -1129,8 +1459,13 @@ class ConstantPool {
|
|||||||
* by their equivalent Utf8s.
|
* by their equivalent Utf8s.
|
||||||
* Also, discard null from cpRefs.
|
* Also, discard null from cpRefs.
|
||||||
*/
|
*/
|
||||||
|
public static void completeReferencesIn(Set<Entry> cpRefs, boolean flattenSigs) {
|
||||||
|
completeReferencesIn(cpRefs, flattenSigs, null);
|
||||||
|
}
|
||||||
|
|
||||||
public static
|
public static
|
||||||
void completeReferencesIn(Set<Entry> cpRefs, boolean flattenSigs) {
|
void completeReferencesIn(Set<Entry> cpRefs, boolean flattenSigs,
|
||||||
|
List<BootstrapMethodEntry>bsms) {
|
||||||
cpRefs.remove(null);
|
cpRefs.remove(null);
|
||||||
for (ListIterator<Entry> work =
|
for (ListIterator<Entry> work =
|
||||||
new ArrayList<>(cpRefs).listIterator(cpRefs.size());
|
new ArrayList<>(cpRefs).listIterator(cpRefs.size());
|
||||||
@ -1146,6 +1481,14 @@ class ConstantPool {
|
|||||||
cpRefs.add(ue);
|
cpRefs.add(ue);
|
||||||
e = ue; // do not descend into the sig
|
e = ue; // do not descend into the sig
|
||||||
}
|
}
|
||||||
|
if (bsms != null && e.tag == CONSTANT_BootstrapMethod) {
|
||||||
|
BootstrapMethodEntry bsm = (BootstrapMethodEntry)e;
|
||||||
|
cpRefs.remove(bsm);
|
||||||
|
// move it away to the side table where it belongs
|
||||||
|
if (!bsms.contains(bsm))
|
||||||
|
bsms.add(bsm);
|
||||||
|
// fall through to recursively add refs for this entry
|
||||||
|
}
|
||||||
// Recursively add the refs of e to cpRefs:
|
// Recursively add the refs of e to cpRefs:
|
||||||
for (int i = 0; ; i++) {
|
for (int i = 0; ; i++) {
|
||||||
Entry re = e.getRef(i);
|
Entry re = e.getRef(i);
|
||||||
@ -1174,15 +1517,37 @@ class ConstantPool {
|
|||||||
case CONSTANT_Methodref: return "Methodref";
|
case CONSTANT_Methodref: return "Methodref";
|
||||||
case CONSTANT_InterfaceMethodref: return "InterfaceMethodref";
|
case CONSTANT_InterfaceMethodref: return "InterfaceMethodref";
|
||||||
case CONSTANT_NameandType: return "NameandType";
|
case CONSTANT_NameandType: return "NameandType";
|
||||||
|
case CONSTANT_MethodHandle: return "MethodHandle";
|
||||||
|
case CONSTANT_MethodType: return "MethodType";
|
||||||
|
case CONSTANT_InvokeDynamic: return "InvokeDynamic";
|
||||||
|
|
||||||
// pseudo-tags:
|
// pseudo-tags:
|
||||||
case CONSTANT_All: return "*All";
|
case CONSTANT_All: return "**All";
|
||||||
case CONSTANT_None: return "*None";
|
case CONSTANT_None: return "**None";
|
||||||
|
case CONSTANT_LoadableValue: return "**LoadableValue";
|
||||||
|
case CONSTANT_AnyMember: return "**AnyMember";
|
||||||
|
case CONSTANT_FieldSpecific: return "*FieldSpecific";
|
||||||
case CONSTANT_Signature: return "*Signature";
|
case CONSTANT_Signature: return "*Signature";
|
||||||
|
case CONSTANT_BootstrapMethod: return "*BootstrapMethod";
|
||||||
}
|
}
|
||||||
return "tag#"+tag;
|
return "tag#"+tag;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static String refKindName(int refKind) {
|
||||||
|
switch (refKind) {
|
||||||
|
case REF_getField: return "getField";
|
||||||
|
case REF_getStatic: return "getStatic";
|
||||||
|
case REF_putField: return "putField";
|
||||||
|
case REF_putStatic: return "putStatic";
|
||||||
|
case REF_invokeVirtual: return "invokeVirtual";
|
||||||
|
case REF_invokeStatic: return "invokeStatic";
|
||||||
|
case REF_invokeSpecial: return "invokeSpecial";
|
||||||
|
case REF_newInvokeSpecial: return "newInvokeSpecial";
|
||||||
|
case REF_invokeInterface: return "invokeInterface";
|
||||||
|
}
|
||||||
|
return "refKind#"+refKind;
|
||||||
|
}
|
||||||
|
|
||||||
// archive constant pool definition order
|
// archive constant pool definition order
|
||||||
static final byte TAGS_IN_ORDER[] = {
|
static final byte TAGS_IN_ORDER[] = {
|
||||||
CONSTANT_Utf8,
|
CONSTANT_Utf8,
|
||||||
@ -1190,13 +1555,19 @@ class ConstantPool {
|
|||||||
CONSTANT_Float,
|
CONSTANT_Float,
|
||||||
CONSTANT_Long,
|
CONSTANT_Long,
|
||||||
CONSTANT_Double,
|
CONSTANT_Double,
|
||||||
CONSTANT_String,
|
CONSTANT_String, // note that String=8 precedes Class=7
|
||||||
CONSTANT_Class,
|
CONSTANT_Class,
|
||||||
CONSTANT_Signature,
|
CONSTANT_Signature,
|
||||||
CONSTANT_NameandType, // cp_Descr
|
CONSTANT_NameandType, // cp_Descr
|
||||||
CONSTANT_Fieldref, // cp_Field
|
CONSTANT_Fieldref, // cp_Field
|
||||||
CONSTANT_Methodref, // cp_Method
|
CONSTANT_Methodref, // cp_Method
|
||||||
CONSTANT_InterfaceMethodref // cp_Imethod
|
CONSTANT_InterfaceMethodref, // cp_Imethod
|
||||||
|
|
||||||
|
// Constants defined in JDK 7 and later:
|
||||||
|
CONSTANT_MethodHandle,
|
||||||
|
CONSTANT_MethodType,
|
||||||
|
CONSTANT_BootstrapMethod, // pseudo-tag, really stored in a class attribute
|
||||||
|
CONSTANT_InvokeDynamic
|
||||||
};
|
};
|
||||||
static final byte TAG_ORDER[];
|
static final byte TAG_ORDER[];
|
||||||
static {
|
static {
|
||||||
@ -1211,4 +1582,45 @@ class ConstantPool {
|
|||||||
System.out.println("};");
|
System.out.println("};");
|
||||||
*/
|
*/
|
||||||
}
|
}
|
||||||
|
static final byte[] NUMBER_TAGS = {
|
||||||
|
CONSTANT_Integer, CONSTANT_Float, CONSTANT_Long, CONSTANT_Double
|
||||||
|
};
|
||||||
|
static final byte[] EXTRA_TAGS = {
|
||||||
|
CONSTANT_MethodHandle, CONSTANT_MethodType,
|
||||||
|
CONSTANT_BootstrapMethod, // pseudo-tag
|
||||||
|
CONSTANT_InvokeDynamic
|
||||||
|
};
|
||||||
|
static final byte[] LOADABLE_VALUE_TAGS = { // for CONSTANT_LoadableValue
|
||||||
|
CONSTANT_Integer, CONSTANT_Float, CONSTANT_Long, CONSTANT_Double,
|
||||||
|
CONSTANT_String, CONSTANT_Class,
|
||||||
|
CONSTANT_MethodHandle, CONSTANT_MethodType
|
||||||
|
};
|
||||||
|
static final byte[] ANY_MEMBER_TAGS = { // for CONSTANT_AnyMember
|
||||||
|
CONSTANT_Fieldref, CONSTANT_Methodref, CONSTANT_InterfaceMethodref
|
||||||
|
};
|
||||||
|
static final byte[] FIELD_SPECIFIC_TAGS = { // for CONSTANT_FieldSpecific
|
||||||
|
CONSTANT_Integer, CONSTANT_Float, CONSTANT_Long, CONSTANT_Double,
|
||||||
|
CONSTANT_String
|
||||||
|
};
|
||||||
|
static {
|
||||||
|
assert(
|
||||||
|
verifyTagOrder(TAGS_IN_ORDER) &&
|
||||||
|
verifyTagOrder(NUMBER_TAGS) &&
|
||||||
|
verifyTagOrder(EXTRA_TAGS) &&
|
||||||
|
verifyTagOrder(LOADABLE_VALUE_TAGS) &&
|
||||||
|
verifyTagOrder(ANY_MEMBER_TAGS) &&
|
||||||
|
verifyTagOrder(FIELD_SPECIFIC_TAGS)
|
||||||
|
);
|
||||||
|
}
|
||||||
|
private static boolean verifyTagOrder(byte[] tags) {
|
||||||
|
int prev = -1;
|
||||||
|
for (byte tag : tags) {
|
||||||
|
int next = TAG_ORDER[tag];
|
||||||
|
assert(next > 0) : "tag not found: "+tag;
|
||||||
|
assert(TAGS_IN_ORDER[next-1] == tag) : "tag repeated: "+tag+" => "+next+" => "+TAGS_IN_ORDER[next-1];
|
||||||
|
assert(prev < next) : "tags not in order: "+Arrays.toString(tags)+" at "+tag;
|
||||||
|
prev = next;
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
|
* Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
|
||||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||||
*
|
*
|
||||||
* This code is free software; you can redistribute it and/or modify it
|
* This code is free software; you can redistribute it and/or modify it
|
||||||
@ -65,6 +65,9 @@ class Constants {
|
|||||||
public final static int JAVA6_PACKAGE_MAJOR_VERSION = 160;
|
public final static int JAVA6_PACKAGE_MAJOR_VERSION = 160;
|
||||||
public final static int JAVA6_PACKAGE_MINOR_VERSION = 1;
|
public final static int JAVA6_PACKAGE_MINOR_VERSION = 1;
|
||||||
|
|
||||||
|
public final static int JAVA7_PACKAGE_MAJOR_VERSION = 170;
|
||||||
|
public final static int JAVA7_PACKAGE_MINOR_VERSION = 1;
|
||||||
|
|
||||||
public final static int CONSTANT_POOL_INDEX_LIMIT = 0x10000;
|
public final static int CONSTANT_POOL_INDEX_LIMIT = 0x10000;
|
||||||
public final static int CONSTANT_POOL_NARROW_LIMIT = 0x00100;
|
public final static int CONSTANT_POOL_NARROW_LIMIT = 0x00100;
|
||||||
|
|
||||||
@ -82,14 +85,36 @@ class Constants {
|
|||||||
public final static byte CONSTANT_Methodref = 10;
|
public final static byte CONSTANT_Methodref = 10;
|
||||||
public final static byte CONSTANT_InterfaceMethodref = 11;
|
public final static byte CONSTANT_InterfaceMethodref = 11;
|
||||||
public final static byte CONSTANT_NameandType = 12;
|
public final static byte CONSTANT_NameandType = 12;
|
||||||
|
public final static byte CONSTANT_unused13 = 13;
|
||||||
|
public final static byte CONSTANT_unused14 = 14;
|
||||||
|
public final static byte CONSTANT_MethodHandle = 15;
|
||||||
|
public final static byte CONSTANT_MethodType = 16;
|
||||||
|
public final static byte CONSTANT_unused17 = 17; // unused
|
||||||
|
public final static byte CONSTANT_InvokeDynamic = 18;
|
||||||
|
|
||||||
// pseudo-constants:
|
// pseudo-constants:
|
||||||
public final static byte CONSTANT_None = 0;
|
public final static byte CONSTANT_None = 0;
|
||||||
public final static byte CONSTANT_Signature = 13;
|
public final static byte CONSTANT_Signature = CONSTANT_unused13;
|
||||||
public final static byte CONSTANT_Limit = 14;
|
public final static byte CONSTANT_BootstrapMethod = CONSTANT_unused17; // used only in InvokeDynamic constants
|
||||||
|
public final static byte CONSTANT_Limit = 19;
|
||||||
|
|
||||||
public final static byte CONSTANT_All = 19; // combined global map
|
public final static byte CONSTANT_All = 50; // combined global map
|
||||||
public final static byte CONSTANT_Literal = 20; // used only for ldc fields
|
public final static byte CONSTANT_LoadableValue = 51; // used for 'KL' and qldc operands
|
||||||
|
public final static byte CONSTANT_AnyMember = 52; // union of refs to field or (interface) method
|
||||||
|
public final static byte CONSTANT_FieldSpecific = 53; // used only for 'KQ' ConstantValue attrs
|
||||||
|
public final static byte CONSTANT_GroupFirst = CONSTANT_All;
|
||||||
|
public final static byte CONSTANT_GroupLimit = CONSTANT_FieldSpecific+1;
|
||||||
|
|
||||||
|
// CONSTANT_MethodHandle reference kinds
|
||||||
|
public final static byte REF_getField = 1;
|
||||||
|
public final static byte REF_getStatic = 2;
|
||||||
|
public final static byte REF_putField = 3;
|
||||||
|
public final static byte REF_putStatic = 4;
|
||||||
|
public final static byte REF_invokeVirtual = 5;
|
||||||
|
public final static byte REF_invokeStatic = 6;
|
||||||
|
public final static byte REF_invokeSpecial = 7;
|
||||||
|
public final static byte REF_newInvokeSpecial = 8;
|
||||||
|
public final static byte REF_invokeInterface = 9;
|
||||||
|
|
||||||
// pseudo-access bits
|
// pseudo-access bits
|
||||||
public final static int ACC_IC_LONG_FORM = (1<<16); //for ic_flags
|
public final static int ACC_IC_LONG_FORM = (1<<16); //for ic_flags
|
||||||
@ -133,7 +158,7 @@ class Constants {
|
|||||||
public static final int AO_HAVE_SPECIAL_FORMATS = 1<<0;
|
public static final int AO_HAVE_SPECIAL_FORMATS = 1<<0;
|
||||||
public static final int AO_HAVE_CP_NUMBERS = 1<<1;
|
public static final int AO_HAVE_CP_NUMBERS = 1<<1;
|
||||||
public static final int AO_HAVE_ALL_CODE_FLAGS = 1<<2;
|
public static final int AO_HAVE_ALL_CODE_FLAGS = 1<<2;
|
||||||
public static final int AO_3_UNUSED_MBZ = 1<<3;
|
public static final int AO_HAVE_CP_EXTRAS = 1<<3;
|
||||||
public static final int AO_HAVE_FILE_HEADERS = 1<<4;
|
public static final int AO_HAVE_FILE_HEADERS = 1<<4;
|
||||||
public static final int AO_DEFLATE_HINT = 1<<5;
|
public static final int AO_DEFLATE_HINT = 1<<5;
|
||||||
public static final int AO_HAVE_FILE_MODTIME = 1<<6;
|
public static final int AO_HAVE_FILE_MODTIME = 1<<6;
|
||||||
@ -143,6 +168,7 @@ class Constants {
|
|||||||
public static final int AO_HAVE_FIELD_FLAGS_HI = 1<<10;
|
public static final int AO_HAVE_FIELD_FLAGS_HI = 1<<10;
|
||||||
public static final int AO_HAVE_METHOD_FLAGS_HI = 1<<11;
|
public static final int AO_HAVE_METHOD_FLAGS_HI = 1<<11;
|
||||||
public static final int AO_HAVE_CODE_FLAGS_HI = 1<<12;
|
public static final int AO_HAVE_CODE_FLAGS_HI = 1<<12;
|
||||||
|
public static final int AO_UNUSED_MBZ = (-1)<<13; // option bits reserved for future use
|
||||||
|
|
||||||
public static final int LG_AO_HAVE_XXX_FLAGS_HI = 9;
|
public static final int LG_AO_HAVE_XXX_FLAGS_HI = 9;
|
||||||
|
|
||||||
@ -357,7 +383,7 @@ class Constants {
|
|||||||
_invokespecial = 183, // 0xb7
|
_invokespecial = 183, // 0xb7
|
||||||
_invokestatic = 184, // 0xb8
|
_invokestatic = 184, // 0xb8
|
||||||
_invokeinterface = 185, // 0xb9
|
_invokeinterface = 185, // 0xb9
|
||||||
_xxxunusedxxx = 186, // 0xba
|
_invokedynamic = 186, // 0xba
|
||||||
_new = 187, // 0xbb
|
_new = 187, // 0xbb
|
||||||
_newarray = 188, // 0xbc
|
_newarray = 188, // 0xbc
|
||||||
_anewarray = 189, // 0xbd
|
_anewarray = 189, // 0xbd
|
||||||
@ -422,15 +448,18 @@ class Constants {
|
|||||||
// Ldc variants gain us only 0.007% improvement in compression ratio,
|
// Ldc variants gain us only 0.007% improvement in compression ratio,
|
||||||
// but they simplify the file format greatly.
|
// but they simplify the file format greatly.
|
||||||
public final static int _xldc_op = _invokeinit_limit;
|
public final static int _xldc_op = _invokeinit_limit;
|
||||||
public final static int _aldc = _ldc;
|
public final static int _sldc = _ldc; // previously named _aldc
|
||||||
public final static int _cldc = _xldc_op+0;
|
public final static int _cldc = _xldc_op+0;
|
||||||
public final static int _ildc = _xldc_op+1;
|
public final static int _ildc = _xldc_op+1;
|
||||||
public final static int _fldc = _xldc_op+2;
|
public final static int _fldc = _xldc_op+2;
|
||||||
public final static int _aldc_w = _ldc_w;
|
public final static int _sldc_w = _ldc_w; // previously named _aldc_w
|
||||||
public final static int _cldc_w = _xldc_op+3;
|
public final static int _cldc_w = _xldc_op+3;
|
||||||
public final static int _ildc_w = _xldc_op+4;
|
public final static int _ildc_w = _xldc_op+4;
|
||||||
public final static int _fldc_w = _xldc_op+5;
|
public final static int _fldc_w = _xldc_op+5;
|
||||||
public final static int _lldc2_w = _ldc2_w;
|
public final static int _lldc2_w = _ldc2_w;
|
||||||
public final static int _dldc2_w = _xldc_op+6;
|
public final static int _dldc2_w = _xldc_op+6;
|
||||||
public final static int _xldc_limit = _xldc_op+7;
|
// anything other than primitive, string, or class must be handled with qldc:
|
||||||
|
public final static int _qldc = _xldc_op+7;
|
||||||
|
public final static int _qldc_w = _xldc_op+8;
|
||||||
|
public final static int _xldc_limit = _xldc_op+9;
|
||||||
}
|
}
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
|
* Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
|
||||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||||
*
|
*
|
||||||
* This code is free software; you can redistribute it and/or modify it
|
* This code is free software; you can redistribute it and/or modify it
|
||||||
@ -451,7 +451,7 @@ class Instruction {
|
|||||||
|
|
||||||
public static byte getCPRefOpTag(int bc) {
|
public static byte getCPRefOpTag(int bc) {
|
||||||
if (bc < BC_INDEX[0].length && BC_INDEX[0][bc] > 0) return BC_TAG[0][bc];
|
if (bc < BC_INDEX[0].length && BC_INDEX[0][bc] > 0) return BC_TAG[0][bc];
|
||||||
if (bc >= _xldc_op && bc < _xldc_limit) return CONSTANT_Literal;
|
if (bc >= _xldc_op && bc < _xldc_limit) return CONSTANT_LoadableValue;
|
||||||
return CONSTANT_None;
|
return CONSTANT_None;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -500,7 +500,7 @@ class Instruction {
|
|||||||
def("bkf", _getstatic, _putfield); // pack kf (base=Field)
|
def("bkf", _getstatic, _putfield); // pack kf (base=Field)
|
||||||
def("bkm", _invokevirtual, _invokestatic); // pack kn (base=Method)
|
def("bkm", _invokevirtual, _invokestatic); // pack kn (base=Method)
|
||||||
def("bkixx", _invokeinterface); // pack ki (base=IMethod), omit xx
|
def("bkixx", _invokeinterface); // pack ki (base=IMethod), omit xx
|
||||||
def("", _xxxunusedxxx);
|
def("bkyxx", _invokedynamic); // pack ky (base=Any), omit xx
|
||||||
def("bkc", _new); // pack kc
|
def("bkc", _new); // pack kc
|
||||||
def("bx", _newarray);
|
def("bx", _newarray);
|
||||||
def("bkc", _anewarray); // pack kc
|
def("bkc", _anewarray); // pack kc
|
||||||
@ -515,7 +515,6 @@ class Instruction {
|
|||||||
//System.out.println(i+": l="+BC_LENGTH[0][i]+" i="+BC_INDEX[0][i]);
|
//System.out.println(i+": l="+BC_LENGTH[0][i]+" i="+BC_INDEX[0][i]);
|
||||||
//assert(BC_LENGTH[0][i] != -1);
|
//assert(BC_LENGTH[0][i] != -1);
|
||||||
if (BC_LENGTH[0][i] == -1) {
|
if (BC_LENGTH[0][i] == -1) {
|
||||||
assert(i == _xxxunusedxxx);
|
|
||||||
continue; // unknown opcode
|
continue; // unknown opcode
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -543,7 +542,7 @@ class Instruction {
|
|||||||
"if_icmpne if_icmplt if_icmpge if_icmpgt if_icmple if_acmpeq if_acmpne "+
|
"if_icmpne if_icmplt if_icmpge if_icmpgt if_icmple if_acmpeq if_acmpne "+
|
||||||
"goto jsr ret tableswitch lookupswitch ireturn lreturn freturn dreturn "+
|
"goto jsr ret tableswitch lookupswitch ireturn lreturn freturn dreturn "+
|
||||||
"areturn return getstatic putstatic getfield putfield invokevirtual "+
|
"areturn return getstatic putstatic getfield putfield invokevirtual "+
|
||||||
"invokespecial invokestatic invokeinterface xxxunusedxxx new newarray "+
|
"invokespecial invokestatic invokeinterface invokedynamic new newarray "+
|
||||||
"anewarray arraylength athrow checkcast instanceof monitorenter "+
|
"anewarray arraylength athrow checkcast instanceof monitorenter "+
|
||||||
"monitorexit wide multianewarray ifnull ifnonnull goto_w jsr_w ";
|
"monitorexit wide multianewarray ifnull ifnonnull goto_w jsr_w ";
|
||||||
for (int bc = 0; names.length() > 0; bc++) {
|
for (int bc = 0; names.length() > 0; bc++) {
|
||||||
@ -588,6 +587,8 @@ class Instruction {
|
|||||||
case _dldc2_w: iname = "*dldc2_w"; break;
|
case _dldc2_w: iname = "*dldc2_w"; break;
|
||||||
case _cldc: iname = "*cldc"; break;
|
case _cldc: iname = "*cldc"; break;
|
||||||
case _cldc_w: iname = "*cldc_w"; break;
|
case _cldc_w: iname = "*cldc_w"; break;
|
||||||
|
case _qldc: iname = "*qldc"; break;
|
||||||
|
case _qldc_w: iname = "*qldc_w"; break;
|
||||||
case _byte_escape: iname = "*byte_escape"; break;
|
case _byte_escape: iname = "*byte_escape"; break;
|
||||||
case _ref_escape: iname = "*ref_escape"; break;
|
case _ref_escape: iname = "*ref_escape"; break;
|
||||||
case _end_marker: iname = "*end"; break;
|
case _end_marker: iname = "*end"; break;
|
||||||
@ -618,15 +619,16 @@ class Instruction {
|
|||||||
if (index > 0 && index+1 < length) {
|
if (index > 0 && index+1 < length) {
|
||||||
switch (fmt.charAt(index+1)) {
|
switch (fmt.charAt(index+1)) {
|
||||||
case 'c': tag = CONSTANT_Class; break;
|
case 'c': tag = CONSTANT_Class; break;
|
||||||
case 'k': tag = CONSTANT_Literal; break;
|
case 'k': tag = CONSTANT_LoadableValue; break;
|
||||||
case 'f': tag = CONSTANT_Fieldref; break;
|
case 'f': tag = CONSTANT_Fieldref; break;
|
||||||
case 'm': tag = CONSTANT_Methodref; break;
|
case 'm': tag = CONSTANT_Methodref; break;
|
||||||
case 'i': tag = CONSTANT_InterfaceMethodref; break;
|
case 'i': tag = CONSTANT_InterfaceMethodref; break;
|
||||||
|
case 'y': tag = CONSTANT_InvokeDynamic; break;
|
||||||
}
|
}
|
||||||
assert(tag != CONSTANT_None);
|
assert(tag != CONSTANT_None);
|
||||||
} else if (index > 0 && length == 2) {
|
} else if (index > 0 && length == 2) {
|
||||||
assert(from_bc == _ldc);
|
assert(from_bc == _ldc);
|
||||||
tag = CONSTANT_Literal; // _ldc opcode only
|
tag = CONSTANT_LoadableValue; // _ldc opcode only
|
||||||
}
|
}
|
||||||
for (int bc = from_bc; bc <= to_bc; bc++) {
|
for (int bc = from_bc; bc <= to_bc; bc++) {
|
||||||
BC_FORMAT[w][bc] = fmt;
|
BC_FORMAT[w][bc] = fmt;
|
||||||
@ -649,7 +651,7 @@ class Instruction {
|
|||||||
Instruction i = at(code, 0);
|
Instruction i = at(code, 0);
|
||||||
while (i != null) {
|
while (i != null) {
|
||||||
int opcode = i.getBC();
|
int opcode = i.getBC();
|
||||||
if (opcode == _xxxunusedxxx || opcode < _nop || opcode > _jsr_w) {
|
if (opcode < _nop || opcode > _jsr_w) {
|
||||||
String message = "illegal opcode: " + opcode + " " + i;
|
String message = "illegal opcode: " + opcode + " " + i;
|
||||||
throw new FormatException(message);
|
throw new FormatException(message);
|
||||||
}
|
}
|
||||||
|
@ -87,7 +87,12 @@ class NativeUnpack {
|
|||||||
// If loading from stand alone build uncomment this.
|
// If loading from stand alone build uncomment this.
|
||||||
// System.loadLibrary("unpack");
|
// System.loadLibrary("unpack");
|
||||||
java.security.AccessController.doPrivileged(
|
java.security.AccessController.doPrivileged(
|
||||||
new sun.security.action.LoadLibraryAction("unpack"));
|
new java.security.PrivilegedAction<Void>() {
|
||||||
|
public Void run() {
|
||||||
|
System.loadLibrary("unpack");
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
});
|
||||||
initIDs();
|
initIDs();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
|
* Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
|
||||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||||
*
|
*
|
||||||
* This code is free software; you can redistribute it and/or modify it
|
* This code is free software; you can redistribute it and/or modify it
|
||||||
@ -28,6 +28,7 @@ package com.sun.java.util.jar.pack;
|
|||||||
import com.sun.java.util.jar.pack.Attribute.Layout;
|
import com.sun.java.util.jar.pack.Attribute.Layout;
|
||||||
import com.sun.java.util.jar.pack.ConstantPool.ClassEntry;
|
import com.sun.java.util.jar.pack.ConstantPool.ClassEntry;
|
||||||
import com.sun.java.util.jar.pack.ConstantPool.DescriptorEntry;
|
import com.sun.java.util.jar.pack.ConstantPool.DescriptorEntry;
|
||||||
|
import com.sun.java.util.jar.pack.ConstantPool.BootstrapMethodEntry;
|
||||||
import com.sun.java.util.jar.pack.ConstantPool.Index;
|
import com.sun.java.util.jar.pack.ConstantPool.Index;
|
||||||
import com.sun.java.util.jar.pack.ConstantPool.LiteralEntry;
|
import com.sun.java.util.jar.pack.ConstantPool.LiteralEntry;
|
||||||
import com.sun.java.util.jar.pack.ConstantPool.Utf8Entry;
|
import com.sun.java.util.jar.pack.ConstantPool.Utf8Entry;
|
||||||
@ -100,6 +101,8 @@ class Package {
|
|||||||
classes.clear();
|
classes.clear();
|
||||||
files.clear();
|
files.clear();
|
||||||
BandStructure.nextSeqForDebug = 0;
|
BandStructure.nextSeqForDebug = 0;
|
||||||
|
package_minver = -1; // fill in later
|
||||||
|
package_majver = 0; // fill in later
|
||||||
}
|
}
|
||||||
|
|
||||||
int getPackageVersion() {
|
int getPackageVersion() {
|
||||||
@ -108,6 +111,7 @@ class Package {
|
|||||||
|
|
||||||
// Special empty versions of Code and InnerClasses, used for markers.
|
// Special empty versions of Code and InnerClasses, used for markers.
|
||||||
public static final Attribute.Layout attrCodeEmpty;
|
public static final Attribute.Layout attrCodeEmpty;
|
||||||
|
public static final Attribute.Layout attrBootstrapMethodsEmpty;
|
||||||
public static final Attribute.Layout attrInnerClassesEmpty;
|
public static final Attribute.Layout attrInnerClassesEmpty;
|
||||||
public static final Attribute.Layout attrSourceFileSpecial;
|
public static final Attribute.Layout attrSourceFileSpecial;
|
||||||
public static final Map<Attribute.Layout, Attribute> attrDefs;
|
public static final Map<Attribute.Layout, Attribute> attrDefs;
|
||||||
@ -115,6 +119,8 @@ class Package {
|
|||||||
Map<Layout, Attribute> ad = new HashMap<>(3);
|
Map<Layout, Attribute> ad = new HashMap<>(3);
|
||||||
attrCodeEmpty = Attribute.define(ad, ATTR_CONTEXT_METHOD,
|
attrCodeEmpty = Attribute.define(ad, ATTR_CONTEXT_METHOD,
|
||||||
"Code", "").layout();
|
"Code", "").layout();
|
||||||
|
attrBootstrapMethodsEmpty = Attribute.define(ad, ATTR_CONTEXT_CLASS,
|
||||||
|
"BootstrapMethods", "").layout();
|
||||||
attrInnerClassesEmpty = Attribute.define(ad, ATTR_CONTEXT_CLASS,
|
attrInnerClassesEmpty = Attribute.define(ad, ATTR_CONTEXT_CLASS,
|
||||||
"InnerClasses", "").layout();
|
"InnerClasses", "").layout();
|
||||||
attrSourceFileSpecial = Attribute.define(ad, ATTR_CONTEXT_CLASS,
|
attrSourceFileSpecial = Attribute.define(ad, ATTR_CONTEXT_CLASS,
|
||||||
@ -153,9 +159,8 @@ class Package {
|
|||||||
package_minver = JAVA6_PACKAGE_MINOR_VERSION;
|
package_minver = JAVA6_PACKAGE_MINOR_VERSION;
|
||||||
} else {
|
} else {
|
||||||
// Normal case. Use the newest archive format, when available
|
// Normal case. Use the newest archive format, when available
|
||||||
// TODO: replace the following with JAVA7* when the need arises
|
package_majver = JAVA7_PACKAGE_MAJOR_VERSION;
|
||||||
package_majver = JAVA6_PACKAGE_MAJOR_VERSION;
|
package_minver = JAVA7_PACKAGE_MINOR_VERSION;
|
||||||
package_minver = JAVA6_PACKAGE_MINOR_VERSION;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -168,13 +173,22 @@ class Package {
|
|||||||
String expMag = Integer.toHexString(JAVA_PACKAGE_MAGIC);
|
String expMag = Integer.toHexString(JAVA_PACKAGE_MAGIC);
|
||||||
throw new IOException("Unexpected package magic number: got "+gotMag+"; expected "+expMag);
|
throw new IOException("Unexpected package magic number: got "+gotMag+"; expected "+expMag);
|
||||||
}
|
}
|
||||||
if ((package_majver != JAVA6_PACKAGE_MAJOR_VERSION &&
|
int[] majminFound = null;
|
||||||
package_majver != JAVA5_PACKAGE_MAJOR_VERSION) ||
|
for (int[] majmin : new int[][]{
|
||||||
(package_minver != JAVA6_PACKAGE_MINOR_VERSION &&
|
{ JAVA7_PACKAGE_MAJOR_VERSION, JAVA7_PACKAGE_MINOR_VERSION },
|
||||||
package_minver != JAVA5_PACKAGE_MINOR_VERSION)) {
|
{ JAVA6_PACKAGE_MAJOR_VERSION, JAVA6_PACKAGE_MINOR_VERSION },
|
||||||
|
{ JAVA5_PACKAGE_MAJOR_VERSION, JAVA5_PACKAGE_MINOR_VERSION }
|
||||||
|
}) {
|
||||||
|
if (package_majver == majmin[0] && package_minver == majmin[1]) {
|
||||||
|
majminFound = majmin;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (majminFound == null) {
|
||||||
String gotVer = package_majver+"."+package_minver;
|
String gotVer = package_majver+"."+package_minver;
|
||||||
String expVer = JAVA6_PACKAGE_MAJOR_VERSION+"."+JAVA6_PACKAGE_MINOR_VERSION+
|
String expVer = JAVA7_PACKAGE_MAJOR_VERSION+"."+JAVA7_PACKAGE_MINOR_VERSION+
|
||||||
|
" OR "+
|
||||||
|
JAVA6_PACKAGE_MAJOR_VERSION+"."+JAVA6_PACKAGE_MINOR_VERSION+
|
||||||
" OR "+
|
" OR "+
|
||||||
JAVA5_PACKAGE_MAJOR_VERSION+"."+JAVA5_PACKAGE_MINOR_VERSION;
|
JAVA5_PACKAGE_MAJOR_VERSION+"."+JAVA5_PACKAGE_MINOR_VERSION;
|
||||||
throw new IOException("Unexpected package minor version: got "+gotVer+"; expected "+expVer);
|
throw new IOException("Unexpected package minor version: got "+gotVer+"; expected "+expVer);
|
||||||
@ -213,6 +227,7 @@ class Package {
|
|||||||
//ArrayList attributes; // in Attribute.Holder.this.attributes
|
//ArrayList attributes; // in Attribute.Holder.this.attributes
|
||||||
// Note that InnerClasses may be collected at the package level.
|
// Note that InnerClasses may be collected at the package level.
|
||||||
ArrayList<InnerClass> innerClasses;
|
ArrayList<InnerClass> innerClasses;
|
||||||
|
ArrayList<BootstrapMethodEntry> bootstrapMethods;
|
||||||
|
|
||||||
Class(int flags, ClassEntry thisClass, ClassEntry superClass, ClassEntry[] interfaces) {
|
Class(int flags, ClassEntry thisClass, ClassEntry superClass, ClassEntry[] interfaces) {
|
||||||
this.magic = JAVA_MAGIC;
|
this.magic = JAVA_MAGIC;
|
||||||
@ -313,6 +328,25 @@ class Package {
|
|||||||
this.cpMap = cpMap;
|
this.cpMap = cpMap;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
boolean hasBootstrapMethods() {
|
||||||
|
return bootstrapMethods != null && !bootstrapMethods.isEmpty();
|
||||||
|
}
|
||||||
|
|
||||||
|
List<BootstrapMethodEntry> getBootstrapMethods() {
|
||||||
|
return bootstrapMethods;
|
||||||
|
}
|
||||||
|
|
||||||
|
BootstrapMethodEntry[] getBootstrapMethodMap() {
|
||||||
|
return (hasBootstrapMethods())
|
||||||
|
? bootstrapMethods.toArray(new BootstrapMethodEntry[bootstrapMethods.size()])
|
||||||
|
: null;
|
||||||
|
}
|
||||||
|
|
||||||
|
void setBootstrapMethods(Collection<BootstrapMethodEntry> bsms) {
|
||||||
|
assert(bootstrapMethods == null); // do not do this twice
|
||||||
|
bootstrapMethods = new ArrayList<>(bsms);
|
||||||
|
}
|
||||||
|
|
||||||
boolean hasInnerClasses() {
|
boolean hasInnerClasses() {
|
||||||
return innerClasses != null;
|
return innerClasses != null;
|
||||||
}
|
}
|
||||||
@ -1283,7 +1317,8 @@ class Package {
|
|||||||
byTagU[tag] = null; // done with it
|
byTagU[tag] = null; // done with it
|
||||||
}
|
}
|
||||||
for (int i = 0; i < byTagU.length; i++) {
|
for (int i = 0; i < byTagU.length; i++) {
|
||||||
assert(byTagU[i] == null); // all consumed
|
Index ix = byTagU[i];
|
||||||
|
assert(ix == null); // all consumed
|
||||||
}
|
}
|
||||||
for (int i = 0; i < ConstantPool.TAGS_IN_ORDER.length; i++) {
|
for (int i = 0; i < ConstantPool.TAGS_IN_ORDER.length; i++) {
|
||||||
byte tag = ConstantPool.TAGS_IN_ORDER[i];
|
byte tag = ConstantPool.TAGS_IN_ORDER[i];
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
|
* Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
|
||||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||||
*
|
*
|
||||||
* This code is free software; you can redistribute it and/or modify it
|
* This code is free software; you can redistribute it and/or modify it
|
||||||
@ -25,13 +25,7 @@
|
|||||||
|
|
||||||
package com.sun.java.util.jar.pack;
|
package com.sun.java.util.jar.pack;
|
||||||
|
|
||||||
import com.sun.java.util.jar.pack.ConstantPool.ClassEntry;
|
import com.sun.java.util.jar.pack.ConstantPool.*;
|
||||||
import com.sun.java.util.jar.pack.ConstantPool.DescriptorEntry;
|
|
||||||
import com.sun.java.util.jar.pack.ConstantPool.Entry;
|
|
||||||
import com.sun.java.util.jar.pack.ConstantPool.Index;
|
|
||||||
import com.sun.java.util.jar.pack.ConstantPool.MemberEntry;
|
|
||||||
import com.sun.java.util.jar.pack.ConstantPool.SignatureEntry;
|
|
||||||
import com.sun.java.util.jar.pack.ConstantPool.Utf8Entry;
|
|
||||||
import com.sun.java.util.jar.pack.Package.Class;
|
import com.sun.java.util.jar.pack.Package.Class;
|
||||||
import com.sun.java.util.jar.pack.Package.File;
|
import com.sun.java.util.jar.pack.Package.File;
|
||||||
import com.sun.java.util.jar.pack.Package.InnerClass;
|
import com.sun.java.util.jar.pack.Package.InnerClass;
|
||||||
@ -46,6 +40,7 @@ import java.util.ArrayList;
|
|||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
import java.util.Collection;
|
import java.util.Collection;
|
||||||
|
import java.util.Collections;
|
||||||
import java.util.Comparator;
|
import java.util.Comparator;
|
||||||
import java.util.HashSet;
|
import java.util.HashSet;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
@ -266,7 +261,6 @@ class PackageReader extends BandStructure {
|
|||||||
// #band_headers_size :UNSIGNED5[1]
|
// #band_headers_size :UNSIGNED5[1]
|
||||||
// #attr_definition_count :UNSIGNED5[1]
|
// #attr_definition_count :UNSIGNED5[1]
|
||||||
//
|
//
|
||||||
assert(AH_LENGTH == 8+(ConstantPool.TAGS_IN_ORDER.length)+6);
|
|
||||||
archive_header_0.expectLength(AH_LENGTH_0);
|
archive_header_0.expectLength(AH_LENGTH_0);
|
||||||
archive_header_0.readFrom(in);
|
archive_header_0.readFrom(in);
|
||||||
|
|
||||||
@ -282,6 +276,7 @@ class PackageReader extends BandStructure {
|
|||||||
boolean haveSpecial = testBit(archiveOptions, AO_HAVE_SPECIAL_FORMATS);
|
boolean haveSpecial = testBit(archiveOptions, AO_HAVE_SPECIAL_FORMATS);
|
||||||
boolean haveFiles = testBit(archiveOptions, AO_HAVE_FILE_HEADERS);
|
boolean haveFiles = testBit(archiveOptions, AO_HAVE_FILE_HEADERS);
|
||||||
boolean haveNumbers = testBit(archiveOptions, AO_HAVE_CP_NUMBERS);
|
boolean haveNumbers = testBit(archiveOptions, AO_HAVE_CP_NUMBERS);
|
||||||
|
boolean haveCPExtra = testBit(archiveOptions, AO_HAVE_CP_EXTRAS);
|
||||||
initAttrIndexLimit();
|
initAttrIndexLimit();
|
||||||
|
|
||||||
// now we are ready to use the data:
|
// now we are ready to use the data:
|
||||||
@ -300,11 +295,11 @@ class PackageReader extends BandStructure {
|
|||||||
archive_header_S.doneDisbursing();
|
archive_header_S.doneDisbursing();
|
||||||
archiveSize0 = in.getBytesServed();
|
archiveSize0 = in.getBytesServed();
|
||||||
|
|
||||||
int remainingHeaders = AH_LENGTH - AH_LENGTH_0 - AH_LENGTH_S;
|
int remainingHeaders = AH_LENGTH_MIN - AH_LENGTH_0 - AH_LENGTH_S;
|
||||||
if (!haveFiles) remainingHeaders -= AH_FILE_HEADER_LEN-AH_LENGTH_S;
|
if (haveFiles) remainingHeaders += AH_FILE_HEADER_LEN;
|
||||||
if (!haveSpecial) remainingHeaders -= AH_SPECIAL_FORMAT_LEN;
|
if (haveSpecial) remainingHeaders += AH_SPECIAL_FORMAT_LEN;
|
||||||
if (!haveNumbers) remainingHeaders -= AH_CP_NUMBER_LEN;
|
if (haveNumbers) remainingHeaders += AH_CP_NUMBER_LEN;
|
||||||
assert(remainingHeaders >= AH_LENGTH_MIN - AH_LENGTH_0);
|
if (haveCPExtra) remainingHeaders += AH_CP_EXTRA_LEN;
|
||||||
archive_header_1.expectLength(remainingHeaders);
|
archive_header_1.expectLength(remainingHeaders);
|
||||||
archive_header_1.readFrom(in);
|
archive_header_1.readFrom(in);
|
||||||
|
|
||||||
@ -325,7 +320,7 @@ class PackageReader extends BandStructure {
|
|||||||
numAttrDefs = 0;
|
numAttrDefs = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
readConstantPoolCounts(haveNumbers);
|
readConstantPoolCounts(haveNumbers, haveCPExtra);
|
||||||
|
|
||||||
numInnerClasses = archive_header_1.getInt();
|
numInnerClasses = archive_header_1.getInt();
|
||||||
|
|
||||||
@ -351,7 +346,7 @@ class PackageReader extends BandStructure {
|
|||||||
band_headers.doneDisbursing();
|
band_headers.doneDisbursing();
|
||||||
}
|
}
|
||||||
|
|
||||||
void readConstantPoolCounts(boolean haveNumbers) throws IOException {
|
void readConstantPoolCounts(boolean haveNumbers, boolean haveCPExtra) throws IOException {
|
||||||
// size the constant pools:
|
// size the constant pools:
|
||||||
for (int k = 0; k < ConstantPool.TAGS_IN_ORDER.length; k++) {
|
for (int k = 0; k < ConstantPool.TAGS_IN_ORDER.length; k++) {
|
||||||
// cp_counts:
|
// cp_counts:
|
||||||
@ -364,6 +359,7 @@ class PackageReader extends BandStructure {
|
|||||||
// #cp_Field_count :UNSIGNED5[1]
|
// #cp_Field_count :UNSIGNED5[1]
|
||||||
// #cp_Method_count :UNSIGNED5[1]
|
// #cp_Method_count :UNSIGNED5[1]
|
||||||
// #cp_Imethod_count :UNSIGNED5[1]
|
// #cp_Imethod_count :UNSIGNED5[1]
|
||||||
|
// (cp_attr_counts) ** (#have_cp_attr_counts)
|
||||||
//
|
//
|
||||||
// cp_number_counts:
|
// cp_number_counts:
|
||||||
// #cp_Int_count :UNSIGNED5[1]
|
// #cp_Int_count :UNSIGNED5[1]
|
||||||
@ -371,6 +367,12 @@ class PackageReader extends BandStructure {
|
|||||||
// #cp_Long_count :UNSIGNED5[1]
|
// #cp_Long_count :UNSIGNED5[1]
|
||||||
// #cp_Double_count :UNSIGNED5[1]
|
// #cp_Double_count :UNSIGNED5[1]
|
||||||
//
|
//
|
||||||
|
// cp_extra_counts:
|
||||||
|
// #cp_MethodHandle_count :UNSIGNED5[1]
|
||||||
|
// #cp_MethodType_count :UNSIGNED5[1]
|
||||||
|
// #cp_InvokeDynamic_count :UNSIGNED5[1]
|
||||||
|
// #cp_BootstrapMethod_count :UNSIGNED5[1]
|
||||||
|
//
|
||||||
byte tag = ConstantPool.TAGS_IN_ORDER[k];
|
byte tag = ConstantPool.TAGS_IN_ORDER[k];
|
||||||
if (!haveNumbers) {
|
if (!haveNumbers) {
|
||||||
// These four counts are optional.
|
// These four counts are optional.
|
||||||
@ -382,6 +384,16 @@ class PackageReader extends BandStructure {
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if (!haveCPExtra) {
|
||||||
|
// These four counts are optional.
|
||||||
|
switch (tag) {
|
||||||
|
case CONSTANT_MethodHandle:
|
||||||
|
case CONSTANT_MethodType:
|
||||||
|
case CONSTANT_InvokeDynamic:
|
||||||
|
case CONSTANT_BootstrapMethod:
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
}
|
||||||
tagCount[tag] = archive_header_1.getInt();
|
tagCount[tag] = archive_header_1.getInt();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -401,6 +413,11 @@ class PackageReader extends BandStructure {
|
|||||||
return index;
|
return index;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void checkLegacy(String bandname) {
|
||||||
|
if (this.pkg.package_majver < JAVA7_PACKAGE_MAJOR_VERSION) {
|
||||||
|
throw new RuntimeException("unexpected band " + bandname);
|
||||||
|
}
|
||||||
|
}
|
||||||
void readConstantPool() throws IOException {
|
void readConstantPool() throws IOException {
|
||||||
// cp_bands:
|
// cp_bands:
|
||||||
// cp_Utf8
|
// cp_Utf8
|
||||||
@ -533,8 +550,82 @@ class PackageReader extends BandStructure {
|
|||||||
case CONSTANT_InterfaceMethodref:
|
case CONSTANT_InterfaceMethodref:
|
||||||
readMemberRefs(tag, cpMap, cp_Imethod_class, cp_Imethod_desc);
|
readMemberRefs(tag, cpMap, cp_Imethod_class, cp_Imethod_desc);
|
||||||
break;
|
break;
|
||||||
|
case CONSTANT_MethodHandle:
|
||||||
|
if (cpMap.length > 0) {
|
||||||
|
checkLegacy(cp_MethodHandle_refkind.name());
|
||||||
|
}
|
||||||
|
cp_MethodHandle_refkind.expectLength(cpMap.length);
|
||||||
|
cp_MethodHandle_refkind.readFrom(in);
|
||||||
|
cp_MethodHandle_member.expectLength(cpMap.length);
|
||||||
|
cp_MethodHandle_member.readFrom(in);
|
||||||
|
cp_MethodHandle_member.setIndex(getCPIndex(CONSTANT_AnyMember));
|
||||||
|
for (int i = 0; i < cpMap.length; i++) {
|
||||||
|
byte refKind = (byte) cp_MethodHandle_refkind.getInt();
|
||||||
|
MemberEntry memRef = (MemberEntry) cp_MethodHandle_member.getRef();
|
||||||
|
cpMap[i] = ConstantPool.getMethodHandleEntry(refKind, memRef);
|
||||||
|
}
|
||||||
|
cp_MethodHandle_refkind.doneDisbursing();
|
||||||
|
cp_MethodHandle_member.doneDisbursing();
|
||||||
|
break;
|
||||||
|
case CONSTANT_MethodType:
|
||||||
|
if (cpMap.length > 0) {
|
||||||
|
checkLegacy(cp_MethodType.name());
|
||||||
|
}
|
||||||
|
cp_MethodType.expectLength(cpMap.length);
|
||||||
|
cp_MethodType.readFrom(in);
|
||||||
|
cp_MethodType.setIndex(getCPIndex(CONSTANT_Signature));
|
||||||
|
for (int i = 0; i < cpMap.length; i++) {
|
||||||
|
SignatureEntry typeRef = (SignatureEntry) cp_MethodType.getRef();
|
||||||
|
cpMap[i] = ConstantPool.getMethodTypeEntry(typeRef);
|
||||||
|
}
|
||||||
|
cp_MethodType.doneDisbursing();
|
||||||
|
break;
|
||||||
|
case CONSTANT_InvokeDynamic:
|
||||||
|
if (cpMap.length > 0) {
|
||||||
|
checkLegacy(cp_InvokeDynamic_spec.name());
|
||||||
|
}
|
||||||
|
cp_InvokeDynamic_spec.expectLength(cpMap.length);
|
||||||
|
cp_InvokeDynamic_spec.readFrom(in);
|
||||||
|
cp_InvokeDynamic_spec.setIndex(getCPIndex(CONSTANT_BootstrapMethod));
|
||||||
|
cp_InvokeDynamic_desc.expectLength(cpMap.length);
|
||||||
|
cp_InvokeDynamic_desc.readFrom(in);
|
||||||
|
cp_InvokeDynamic_desc.setIndex(getCPIndex(CONSTANT_NameandType));
|
||||||
|
for (int i = 0; i < cpMap.length; i++) {
|
||||||
|
BootstrapMethodEntry bss = (BootstrapMethodEntry) cp_InvokeDynamic_spec.getRef();
|
||||||
|
DescriptorEntry descr = (DescriptorEntry) cp_InvokeDynamic_desc.getRef();
|
||||||
|
cpMap[i] = ConstantPool.getInvokeDynamicEntry(bss, descr);
|
||||||
|
}
|
||||||
|
cp_InvokeDynamic_spec.doneDisbursing();
|
||||||
|
cp_InvokeDynamic_desc.doneDisbursing();
|
||||||
|
break;
|
||||||
|
case CONSTANT_BootstrapMethod:
|
||||||
|
if (cpMap.length > 0) {
|
||||||
|
checkLegacy(cp_BootstrapMethod_ref.name());
|
||||||
|
}
|
||||||
|
cp_BootstrapMethod_ref.expectLength(cpMap.length);
|
||||||
|
cp_BootstrapMethod_ref.readFrom(in);
|
||||||
|
cp_BootstrapMethod_ref.setIndex(getCPIndex(CONSTANT_MethodHandle));
|
||||||
|
cp_BootstrapMethod_arg_count.expectLength(cpMap.length);
|
||||||
|
cp_BootstrapMethod_arg_count.readFrom(in);
|
||||||
|
int totalArgCount = cp_BootstrapMethod_arg_count.getIntTotal();
|
||||||
|
cp_BootstrapMethod_arg.expectLength(totalArgCount);
|
||||||
|
cp_BootstrapMethod_arg.readFrom(in);
|
||||||
|
cp_BootstrapMethod_arg.setIndex(getCPIndex(CONSTANT_LoadableValue));
|
||||||
|
for (int i = 0; i < cpMap.length; i++) {
|
||||||
|
MethodHandleEntry bsm = (MethodHandleEntry) cp_BootstrapMethod_ref.getRef();
|
||||||
|
int argc = cp_BootstrapMethod_arg_count.getInt();
|
||||||
|
Entry[] argRefs = new Entry[argc];
|
||||||
|
for (int j = 0; j < argc; j++) {
|
||||||
|
argRefs[j] = cp_BootstrapMethod_arg.getRef();
|
||||||
|
}
|
||||||
|
cpMap[i] = ConstantPool.getBootstrapMethodEntry(bsm, argRefs);
|
||||||
|
}
|
||||||
|
cp_BootstrapMethod_ref.doneDisbursing();
|
||||||
|
cp_BootstrapMethod_arg_count.doneDisbursing();
|
||||||
|
cp_BootstrapMethod_arg.doneDisbursing();
|
||||||
|
break;
|
||||||
default:
|
default:
|
||||||
assert(false);
|
throw new AssertionError("unexpected CP tag in package");
|
||||||
}
|
}
|
||||||
|
|
||||||
Index index = initCPIndex(tag, cpMap);
|
Index index = initCPIndex(tag, cpMap);
|
||||||
@ -548,6 +639,21 @@ class PackageReader extends BandStructure {
|
|||||||
|
|
||||||
cp_bands.doneDisbursing();
|
cp_bands.doneDisbursing();
|
||||||
|
|
||||||
|
if (optDumpBands || verbose > 1) {
|
||||||
|
for (byte tag = CONSTANT_GroupFirst; tag < CONSTANT_GroupLimit; tag++) {
|
||||||
|
Index index = pkg.cp.getIndexByTag(tag);
|
||||||
|
if (index == null || index.isEmpty()) continue;
|
||||||
|
Entry[] cpMap = index.cpMap;
|
||||||
|
if (verbose > 1)
|
||||||
|
Utils.log.info("Index group "+ConstantPool.tagName(tag)+" contains "+cpMap.length+" entries.");
|
||||||
|
if (optDumpBands) {
|
||||||
|
try (PrintStream ps = new PrintStream(getDumpStream(index.debugName, tag, ".gidx", index))) {
|
||||||
|
printArrayTo(ps, cpMap, 0, cpMap.length, true);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
setBandIndexes();
|
setBandIndexes();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1056,8 +1162,16 @@ class PackageReader extends BandStructure {
|
|||||||
// look for constant pool entries:
|
// look for constant pool entries:
|
||||||
cls.visitRefs(VRM_CLASSIC, cpRefs);
|
cls.visitRefs(VRM_CLASSIC, cpRefs);
|
||||||
|
|
||||||
|
ArrayList<BootstrapMethodEntry> bsms = new ArrayList<>();
|
||||||
|
/*
|
||||||
|
* BootstrapMethod(BSMs) are added here before InnerClasses(ICs),
|
||||||
|
* so as to ensure the order. Noting that the BSMs may be
|
||||||
|
* removed if they are not found in the CP, after the ICs expansion.
|
||||||
|
*/
|
||||||
|
cls.addAttribute(Package.attrBootstrapMethodsEmpty.canonicalInstance());
|
||||||
|
|
||||||
// flesh out the local constant pool
|
// flesh out the local constant pool
|
||||||
ConstantPool.completeReferencesIn(cpRefs, true);
|
ConstantPool.completeReferencesIn(cpRefs, true, bsms);
|
||||||
|
|
||||||
// Now that we know all our local class references,
|
// Now that we know all our local class references,
|
||||||
// compute the InnerClasses attribute.
|
// compute the InnerClasses attribute.
|
||||||
@ -1074,14 +1188,23 @@ class PackageReader extends BandStructure {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// flesh out the local constant pool, again
|
// flesh out the local constant pool, again
|
||||||
ConstantPool.completeReferencesIn(cpRefs, true);
|
ConstantPool.completeReferencesIn(cpRefs, true, bsms);
|
||||||
|
}
|
||||||
|
|
||||||
|
// remove the attr previously set, otherwise add the bsm and
|
||||||
|
// references as required
|
||||||
|
if (bsms.isEmpty()) {
|
||||||
|
cls.attributes.remove(Package.attrBootstrapMethodsEmpty.canonicalInstance());
|
||||||
|
} else {
|
||||||
|
cpRefs.add(Package.getRefString("BootstrapMethods"));
|
||||||
|
Collections.sort(bsms);
|
||||||
|
cls.setBootstrapMethods(bsms);
|
||||||
}
|
}
|
||||||
|
|
||||||
// construct a local constant pool
|
// construct a local constant pool
|
||||||
int numDoubles = 0;
|
int numDoubles = 0;
|
||||||
for (Entry e : cpRefs) {
|
for (Entry e : cpRefs) {
|
||||||
if (e.isDoubleWord()) numDoubles++;
|
if (e.isDoubleWord()) numDoubles++;
|
||||||
assert(e.tag != CONSTANT_Signature) : (e);
|
|
||||||
}
|
}
|
||||||
Entry[] cpMap = new Entry[1+numDoubles+cpRefs.size()];
|
Entry[] cpMap = new Entry[1+numDoubles+cpRefs.size()];
|
||||||
int fillp = 1;
|
int fillp = 1;
|
||||||
@ -1154,7 +1277,8 @@ class PackageReader extends BandStructure {
|
|||||||
int totalNM = class_method_count.getIntTotal();
|
int totalNM = class_method_count.getIntTotal();
|
||||||
field_descr.expectLength(totalNF);
|
field_descr.expectLength(totalNF);
|
||||||
method_descr.expectLength(totalNM);
|
method_descr.expectLength(totalNM);
|
||||||
if (verbose > 1) Utils.log.fine("expecting #fields="+totalNF+" and #methods="+totalNM+" in #classes="+numClasses);
|
if (verbose > 1) Utils.log.fine("expecting #fields="+totalNF+
|
||||||
|
" and #methods="+totalNM+" in #classes="+numClasses);
|
||||||
|
|
||||||
List<Class.Field> fields = new ArrayList<>(totalNF);
|
List<Class.Field> fields = new ArrayList<>(totalNF);
|
||||||
field_descr.readFrom(in);
|
field_descr.readFrom(in);
|
||||||
@ -1393,7 +1517,8 @@ class PackageReader extends BandStructure {
|
|||||||
MultiBand xxx_attr_bands = attrBands[ctype];
|
MultiBand xxx_attr_bands = attrBands[ctype];
|
||||||
long flagMask = attrFlagMask[ctype];
|
long flagMask = attrFlagMask[ctype];
|
||||||
if (verbose > 1) {
|
if (verbose > 1) {
|
||||||
Utils.log.fine("scanning flags and attrs for "+Attribute.contextName(ctype)+"["+holders.size()+"]");
|
Utils.log.fine("scanning flags and attrs for "+
|
||||||
|
Attribute.contextName(ctype)+"["+holders.size()+"]");
|
||||||
}
|
}
|
||||||
|
|
||||||
// Fetch the attribute layout definitions which govern the bands
|
// Fetch the attribute layout definitions which govern the bands
|
||||||
@ -1751,8 +1876,10 @@ class PackageReader extends BandStructure {
|
|||||||
bc_local, bc_label,
|
bc_local, bc_label,
|
||||||
bc_intref, bc_floatref,
|
bc_intref, bc_floatref,
|
||||||
bc_longref, bc_doubleref, bc_stringref,
|
bc_longref, bc_doubleref, bc_stringref,
|
||||||
|
bc_loadablevalueref,
|
||||||
bc_classref, bc_fieldref,
|
bc_classref, bc_fieldref,
|
||||||
bc_methodref, bc_imethodref,
|
bc_methodref, bc_imethodref,
|
||||||
|
bc_indyref,
|
||||||
bc_thisfield, bc_superfield,
|
bc_thisfield, bc_superfield,
|
||||||
bc_thismethod, bc_supermethod,
|
bc_thismethod, bc_supermethod,
|
||||||
bc_initref,
|
bc_initref,
|
||||||
@ -2099,7 +2226,8 @@ class PackageReader extends BandStructure {
|
|||||||
case _ildc:
|
case _ildc:
|
||||||
case _cldc:
|
case _cldc:
|
||||||
case _fldc:
|
case _fldc:
|
||||||
case _aldc:
|
case _sldc:
|
||||||
|
case _qldc:
|
||||||
origBC = _ldc;
|
origBC = _ldc;
|
||||||
size = 1;
|
size = 1;
|
||||||
ldcRefSet.add(ref);
|
ldcRefSet.add(ref);
|
||||||
@ -2107,7 +2235,8 @@ class PackageReader extends BandStructure {
|
|||||||
case _ildc_w:
|
case _ildc_w:
|
||||||
case _cldc_w:
|
case _cldc_w:
|
||||||
case _fldc_w:
|
case _fldc_w:
|
||||||
case _aldc_w:
|
case _sldc_w:
|
||||||
|
case _qldc_w:
|
||||||
origBC = _ldc_w;
|
origBC = _ldc_w;
|
||||||
break;
|
break;
|
||||||
case _lldc2_w:
|
case _lldc2_w:
|
||||||
@ -2136,6 +2265,9 @@ class PackageReader extends BandStructure {
|
|||||||
int argSize = ((MemberEntry)ref).descRef.typeRef.computeSize(true);
|
int argSize = ((MemberEntry)ref).descRef.typeRef.computeSize(true);
|
||||||
buf[pc++] = (byte)( 1 + argSize );
|
buf[pc++] = (byte)( 1 + argSize );
|
||||||
buf[pc++] = 0;
|
buf[pc++] = 0;
|
||||||
|
} else if (origBC == _invokedynamic) {
|
||||||
|
buf[pc++] = 0;
|
||||||
|
buf[pc++] = 0;
|
||||||
}
|
}
|
||||||
assert(Instruction.opLength(origBC) == (pc - curPC));
|
assert(Instruction.opLength(origBC) == (pc - curPC));
|
||||||
continue;
|
continue;
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
|
* Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
|
||||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||||
*
|
*
|
||||||
* This code is free software; you can redistribute it and/or modify it
|
* This code is free software; you can redistribute it and/or modify it
|
||||||
@ -25,15 +25,7 @@
|
|||||||
|
|
||||||
package com.sun.java.util.jar.pack;
|
package com.sun.java.util.jar.pack;
|
||||||
|
|
||||||
import com.sun.java.util.jar.pack.ConstantPool.ClassEntry;
|
import com.sun.java.util.jar.pack.ConstantPool.*;
|
||||||
import com.sun.java.util.jar.pack.ConstantPool.DescriptorEntry;
|
|
||||||
import com.sun.java.util.jar.pack.ConstantPool.Entry;
|
|
||||||
import com.sun.java.util.jar.pack.ConstantPool.Index;
|
|
||||||
import com.sun.java.util.jar.pack.ConstantPool.IndexGroup;
|
|
||||||
import com.sun.java.util.jar.pack.ConstantPool.MemberEntry;
|
|
||||||
import com.sun.java.util.jar.pack.ConstantPool.NumberEntry;
|
|
||||||
import com.sun.java.util.jar.pack.ConstantPool.SignatureEntry;
|
|
||||||
import com.sun.java.util.jar.pack.ConstantPool.StringEntry;
|
|
||||||
import com.sun.java.util.jar.pack.Package.Class;
|
import com.sun.java.util.jar.pack.Package.Class;
|
||||||
import com.sun.java.util.jar.pack.Package.File;
|
import com.sun.java.util.jar.pack.Package.File;
|
||||||
import com.sun.java.util.jar.pack.Package.InnerClass;
|
import com.sun.java.util.jar.pack.Package.InnerClass;
|
||||||
@ -281,7 +273,7 @@ class PackageWriter extends BandStructure {
|
|||||||
|
|
||||||
void writeArchiveHeader() throws IOException {
|
void writeArchiveHeader() throws IOException {
|
||||||
// for debug only: number of words optimized away
|
// for debug only: number of words optimized away
|
||||||
int headerDiscountForDebug = 0;
|
int headerSizeForDebug = AH_LENGTH_MIN;
|
||||||
|
|
||||||
// AO_HAVE_SPECIAL_FORMATS is set if non-default
|
// AO_HAVE_SPECIAL_FORMATS is set if non-default
|
||||||
// coding techniques are used, or if there are
|
// coding techniques are used, or if there are
|
||||||
@ -293,8 +285,8 @@ class PackageWriter extends BandStructure {
|
|||||||
if (haveSpecial)
|
if (haveSpecial)
|
||||||
archiveOptions |= AO_HAVE_SPECIAL_FORMATS;
|
archiveOptions |= AO_HAVE_SPECIAL_FORMATS;
|
||||||
}
|
}
|
||||||
if (!haveSpecial)
|
if (haveSpecial)
|
||||||
headerDiscountForDebug += AH_SPECIAL_FORMAT_LEN;
|
headerSizeForDebug += AH_SPECIAL_FORMAT_LEN;
|
||||||
|
|
||||||
// AO_HAVE_FILE_HEADERS is set if there is any
|
// AO_HAVE_FILE_HEADERS is set if there is any
|
||||||
// file or segment envelope information present.
|
// file or segment envelope information present.
|
||||||
@ -305,8 +297,8 @@ class PackageWriter extends BandStructure {
|
|||||||
if (haveFiles)
|
if (haveFiles)
|
||||||
archiveOptions |= AO_HAVE_FILE_HEADERS;
|
archiveOptions |= AO_HAVE_FILE_HEADERS;
|
||||||
}
|
}
|
||||||
if (!haveFiles)
|
if (haveFiles)
|
||||||
headerDiscountForDebug += AH_FILE_HEADER_LEN;
|
headerSizeForDebug += AH_FILE_HEADER_LEN;
|
||||||
|
|
||||||
// AO_HAVE_CP_NUMBERS is set if there are any numbers
|
// AO_HAVE_CP_NUMBERS is set if there are any numbers
|
||||||
// in the global constant pool. (Numbers are in 15% of classes.)
|
// in the global constant pool. (Numbers are in 15% of classes.)
|
||||||
@ -316,8 +308,19 @@ class PackageWriter extends BandStructure {
|
|||||||
if (haveNumbers)
|
if (haveNumbers)
|
||||||
archiveOptions |= AO_HAVE_CP_NUMBERS;
|
archiveOptions |= AO_HAVE_CP_NUMBERS;
|
||||||
}
|
}
|
||||||
if (!haveNumbers)
|
if (haveNumbers)
|
||||||
headerDiscountForDebug += AH_CP_NUMBER_LEN;
|
headerSizeForDebug += AH_CP_NUMBER_LEN;
|
||||||
|
|
||||||
|
// AO_HAVE_CP_EXTRAS is set if there are constant pool entries
|
||||||
|
// beyond the Java 6 version of the class file format.
|
||||||
|
boolean haveCPExtra = testBit(archiveOptions, AO_HAVE_CP_EXTRAS);
|
||||||
|
if (!haveCPExtra) {
|
||||||
|
haveCPExtra |= pkg.cp.haveExtraTags();
|
||||||
|
if (haveCPExtra)
|
||||||
|
archiveOptions |= AO_HAVE_CP_EXTRAS;
|
||||||
|
}
|
||||||
|
if (haveCPExtra)
|
||||||
|
headerSizeForDebug += AH_CP_EXTRA_LEN;
|
||||||
|
|
||||||
assert(pkg.package_majver > 0); // caller must specify!
|
assert(pkg.package_majver > 0); // caller must specify!
|
||||||
archive_header_0.putInt(pkg.package_minver);
|
archive_header_0.putInt(pkg.package_minver);
|
||||||
@ -355,18 +358,18 @@ class PackageWriter extends BandStructure {
|
|||||||
assert(attrDefsWritten.length == 0);
|
assert(attrDefsWritten.length == 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
writeConstantPoolCounts(haveNumbers);
|
writeConstantPoolCounts(haveNumbers, haveCPExtra);
|
||||||
|
|
||||||
archive_header_1.putInt(pkg.getAllInnerClasses().size());
|
archive_header_1.putInt(pkg.getAllInnerClasses().size());
|
||||||
archive_header_1.putInt(pkg.default_class_minver);
|
archive_header_1.putInt(pkg.default_class_minver);
|
||||||
archive_header_1.putInt(pkg.default_class_majver);
|
archive_header_1.putInt(pkg.default_class_majver);
|
||||||
archive_header_1.putInt(pkg.classes.size());
|
archive_header_1.putInt(pkg.classes.size());
|
||||||
|
|
||||||
// Sanity: Make sure we came out to 26 (less optional fields):
|
// Sanity: Make sure we came out to 29 (less optional fields):
|
||||||
assert(archive_header_0.length() +
|
assert(archive_header_0.length() +
|
||||||
archive_header_S.length() +
|
archive_header_S.length() +
|
||||||
archive_header_1.length()
|
archive_header_1.length()
|
||||||
== AH_LENGTH - headerDiscountForDebug);
|
== headerSizeForDebug);
|
||||||
|
|
||||||
// Figure out all the sizes now, first cut:
|
// Figure out all the sizes now, first cut:
|
||||||
archiveSize0 = 0;
|
archiveSize0 = 0;
|
||||||
@ -394,9 +397,8 @@ class PackageWriter extends BandStructure {
|
|||||||
assert(all_bands.outputSize() == archiveSize0+archiveSize1);
|
assert(all_bands.outputSize() == archiveSize0+archiveSize1);
|
||||||
}
|
}
|
||||||
|
|
||||||
void writeConstantPoolCounts(boolean haveNumbers) throws IOException {
|
void writeConstantPoolCounts(boolean haveNumbers, boolean haveCPExtra) throws IOException {
|
||||||
for (int k = 0; k < ConstantPool.TAGS_IN_ORDER.length; k++) {
|
for (byte tag : ConstantPool.TAGS_IN_ORDER) {
|
||||||
byte tag = ConstantPool.TAGS_IN_ORDER[k];
|
|
||||||
int count = pkg.cp.getIndexByTag(tag).size();
|
int count = pkg.cp.getIndexByTag(tag).size();
|
||||||
switch (tag) {
|
switch (tag) {
|
||||||
case CONSTANT_Utf8:
|
case CONSTANT_Utf8:
|
||||||
@ -416,6 +418,17 @@ class PackageWriter extends BandStructure {
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
case CONSTANT_MethodHandle:
|
||||||
|
case CONSTANT_MethodType:
|
||||||
|
case CONSTANT_InvokeDynamic:
|
||||||
|
case CONSTANT_BootstrapMethod:
|
||||||
|
// Omit counts for newer entities if possible.
|
||||||
|
if (!haveCPExtra) {
|
||||||
|
assert(count == 0);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
archive_header_1.putInt(count);
|
archive_header_1.putInt(count);
|
||||||
}
|
}
|
||||||
@ -449,8 +462,7 @@ class PackageWriter extends BandStructure {
|
|||||||
|
|
||||||
if (verbose > 0) Utils.log.info("Writing CP");
|
if (verbose > 0) Utils.log.info("Writing CP");
|
||||||
|
|
||||||
for (int k = 0; k < ConstantPool.TAGS_IN_ORDER.length; k++) {
|
for (byte tag : ConstantPool.TAGS_IN_ORDER) {
|
||||||
byte tag = ConstantPool.TAGS_IN_ORDER[k];
|
|
||||||
Index index = cp.getIndexByTag(tag);
|
Index index = cp.getIndexByTag(tag);
|
||||||
|
|
||||||
Entry[] cpMap = index.cpMap;
|
Entry[] cpMap = index.cpMap;
|
||||||
@ -530,8 +542,52 @@ class PackageWriter extends BandStructure {
|
|||||||
case CONSTANT_InterfaceMethodref:
|
case CONSTANT_InterfaceMethodref:
|
||||||
writeMemberRefs(tag, cpMap, cp_Imethod_class, cp_Imethod_desc);
|
writeMemberRefs(tag, cpMap, cp_Imethod_class, cp_Imethod_desc);
|
||||||
break;
|
break;
|
||||||
|
case CONSTANT_MethodHandle:
|
||||||
|
for (int i = 0; i < cpMap.length; i++) {
|
||||||
|
MethodHandleEntry e = (MethodHandleEntry) cpMap[i];
|
||||||
|
cp_MethodHandle_refkind.putInt(e.refKind);
|
||||||
|
cp_MethodHandle_member.putRef(e.memRef);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
case CONSTANT_MethodType:
|
||||||
|
for (int i = 0; i < cpMap.length; i++) {
|
||||||
|
MethodTypeEntry e = (MethodTypeEntry) cpMap[i];
|
||||||
|
cp_MethodType.putRef(e.typeRef);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
case CONSTANT_InvokeDynamic:
|
||||||
|
for (int i = 0; i < cpMap.length; i++) {
|
||||||
|
InvokeDynamicEntry e = (InvokeDynamicEntry) cpMap[i];
|
||||||
|
cp_InvokeDynamic_spec.putRef(e.bssRef);
|
||||||
|
cp_InvokeDynamic_desc.putRef(e.descRef);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
case CONSTANT_BootstrapMethod:
|
||||||
|
for (int i = 0; i < cpMap.length; i++) {
|
||||||
|
BootstrapMethodEntry e = (BootstrapMethodEntry) cpMap[i];
|
||||||
|
cp_BootstrapMethod_ref.putRef(e.bsmRef);
|
||||||
|
cp_BootstrapMethod_arg_count.putInt(e.argRefs.length);
|
||||||
|
for (Entry argRef : e.argRefs) {
|
||||||
|
cp_BootstrapMethod_arg.putRef(argRef);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
break;
|
||||||
default:
|
default:
|
||||||
assert(false);
|
throw new AssertionError("unexpected CP tag in package");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (optDumpBands || verbose > 1) {
|
||||||
|
for (byte tag = CONSTANT_GroupFirst; tag < CONSTANT_GroupLimit; tag++) {
|
||||||
|
Index index = cp.getIndexByTag(tag);
|
||||||
|
if (index == null || index.isEmpty()) continue;
|
||||||
|
Entry[] cpMap = index.cpMap;
|
||||||
|
if (verbose > 1)
|
||||||
|
Utils.log.info("Index group "+ConstantPool.tagName(tag)+" contains "+cpMap.length+" entries.");
|
||||||
|
if (optDumpBands) {
|
||||||
|
try (PrintStream ps = new PrintStream(getDumpStream(index.debugName, tag, ".gidx", index))) {
|
||||||
|
printArrayTo(ps, cpMap, 0, cpMap.length, true);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -988,6 +1044,8 @@ class PackageWriter extends BandStructure {
|
|||||||
for (Class cls : pkg.classes) {
|
for (Class cls : pkg.classes) {
|
||||||
// Replace "obvious" SourceFile attrs by null.
|
// Replace "obvious" SourceFile attrs by null.
|
||||||
cls.minimizeSourceFile();
|
cls.minimizeSourceFile();
|
||||||
|
// BootstrapMethods should never have been inserted.
|
||||||
|
assert(cls.getAttribute(Package.attrBootstrapMethodsEmpty) == null);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1325,9 +1383,7 @@ class PackageWriter extends BandStructure {
|
|||||||
// %%% Add a stress mode which issues _ref/_byte_escape.
|
// %%% Add a stress mode which issues _ref/_byte_escape.
|
||||||
if (verbose > 3) Utils.log.fine(i.toString());
|
if (verbose > 3) Utils.log.fine(i.toString());
|
||||||
|
|
||||||
if (i.isNonstandard()
|
if (i.isNonstandard()) {
|
||||||
&& (!p200.getBoolean(Utils.COM_PREFIX+"invokedynamic")
|
|
||||||
|| i.getBC() != _xxxunusedxxx)) {
|
|
||||||
// Crash and burn with a complaint if there are funny
|
// Crash and burn with a complaint if there are funny
|
||||||
// bytecodes in this class file.
|
// bytecodes in this class file.
|
||||||
String complaint = code.getMethod()
|
String complaint = code.getMethod()
|
||||||
@ -1427,24 +1483,6 @@ class PackageWriter extends BandStructure {
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
switch (bc) {
|
|
||||||
case _xxxunusedxxx: // %%% pretend this is invokedynamic
|
|
||||||
{
|
|
||||||
i.setNonstandardLength(3);
|
|
||||||
int refx = i.getShortAt(1);
|
|
||||||
Entry ref = (refx == 0)? null: curCPMap[refx];
|
|
||||||
// transmit the opcode, carefully:
|
|
||||||
bc_codes.putByte(_byte_escape);
|
|
||||||
bc_escsize.putInt(1); // one byte of opcode
|
|
||||||
bc_escbyte.putByte(bc); // the opcode
|
|
||||||
// transmit the CP reference, carefully:
|
|
||||||
bc_codes.putByte(_ref_escape);
|
|
||||||
bc_escrefsize.putInt(2); // two bytes of ref
|
|
||||||
bc_escref.putRef(ref); // the ref
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
int branch = i.getBranchLabel();
|
int branch = i.getBranchLabel();
|
||||||
if (branch >= 0) {
|
if (branch >= 0) {
|
||||||
bc_codes.putByte(bc);
|
bc_codes.putByte(bc);
|
||||||
@ -1458,7 +1496,7 @@ class PackageWriter extends BandStructure {
|
|||||||
CPRefBand bc_which;
|
CPRefBand bc_which;
|
||||||
int vbc = bc;
|
int vbc = bc;
|
||||||
switch (i.getCPTag()) {
|
switch (i.getCPTag()) {
|
||||||
case CONSTANT_Literal:
|
case CONSTANT_LoadableValue:
|
||||||
switch (ref.tag) {
|
switch (ref.tag) {
|
||||||
case CONSTANT_Integer:
|
case CONSTANT_Integer:
|
||||||
bc_which = bc_intref;
|
bc_which = bc_intref;
|
||||||
@ -1489,8 +1527,8 @@ class PackageWriter extends BandStructure {
|
|||||||
case CONSTANT_String:
|
case CONSTANT_String:
|
||||||
bc_which = bc_stringref;
|
bc_which = bc_stringref;
|
||||||
switch (bc) {
|
switch (bc) {
|
||||||
case _ldc: vbc = _aldc; break;
|
case _ldc: vbc = _sldc; break;
|
||||||
case _ldc_w: vbc = _aldc_w; break;
|
case _ldc_w: vbc = _sldc_w; break;
|
||||||
default: assert(false);
|
default: assert(false);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
@ -1503,8 +1541,16 @@ class PackageWriter extends BandStructure {
|
|||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
bc_which = null;
|
// CONSTANT_MethodHandle, etc.
|
||||||
assert(false);
|
if (getPackageMajver() < JAVA7_PACKAGE_MAJOR_VERSION) {
|
||||||
|
throw new IOException("bad package major version for Java 7 ldc");
|
||||||
|
}
|
||||||
|
bc_which = bc_loadablevalueref;
|
||||||
|
switch (bc) {
|
||||||
|
case _ldc: vbc = _qldc; break;
|
||||||
|
case _ldc_w: vbc = _qldc_w; break;
|
||||||
|
default: assert(false);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case CONSTANT_Class:
|
case CONSTANT_Class:
|
||||||
@ -1517,6 +1563,8 @@ class PackageWriter extends BandStructure {
|
|||||||
bc_which = bc_methodref; break;
|
bc_which = bc_methodref; break;
|
||||||
case CONSTANT_InterfaceMethodref:
|
case CONSTANT_InterfaceMethodref:
|
||||||
bc_which = bc_imethodref; break;
|
bc_which = bc_imethodref; break;
|
||||||
|
case CONSTANT_InvokeDynamic:
|
||||||
|
bc_which = bc_indyref; break;
|
||||||
default:
|
default:
|
||||||
bc_which = null;
|
bc_which = null;
|
||||||
assert(false);
|
assert(false);
|
||||||
@ -1532,6 +1580,12 @@ class PackageWriter extends BandStructure {
|
|||||||
assert(i.getLength() == 5);
|
assert(i.getLength() == 5);
|
||||||
// Make sure the discarded bytes are sane:
|
// Make sure the discarded bytes are sane:
|
||||||
assert(i.getConstant() == (1+((MemberEntry)ref).descRef.typeRef.computeSize(true)) << 8);
|
assert(i.getConstant() == (1+((MemberEntry)ref).descRef.typeRef.computeSize(true)) << 8);
|
||||||
|
} else if (bc == _invokedynamic) {
|
||||||
|
if (getPackageMajver() < JAVA7_PACKAGE_MAJOR_VERSION) {
|
||||||
|
throw new IOException("bad package major version for Java 7 invokedynamic");
|
||||||
|
}
|
||||||
|
assert(i.getLength() == 5);
|
||||||
|
assert(i.getConstant() == 0); // last 2 bytes MBZ
|
||||||
} else {
|
} else {
|
||||||
// Make sure there is nothing else to write.
|
// Make sure there is nothing else to write.
|
||||||
assert(i.getLength() == ((bc == _ldc)?2:3));
|
assert(i.getLength() == ((bc == _ldc)?2:3));
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
|
* Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
|
||||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||||
*
|
*
|
||||||
* This code is free software; you can redistribute it and/or modify it
|
* This code is free software; you can redistribute it and/or modify it
|
||||||
@ -28,6 +28,10 @@ import com.sun.java.util.jar.pack.ConstantPool.ClassEntry;
|
|||||||
import com.sun.java.util.jar.pack.ConstantPool.DescriptorEntry;
|
import com.sun.java.util.jar.pack.ConstantPool.DescriptorEntry;
|
||||||
import com.sun.java.util.jar.pack.ConstantPool.LiteralEntry;
|
import com.sun.java.util.jar.pack.ConstantPool.LiteralEntry;
|
||||||
import com.sun.java.util.jar.pack.ConstantPool.MemberEntry;
|
import com.sun.java.util.jar.pack.ConstantPool.MemberEntry;
|
||||||
|
import com.sun.java.util.jar.pack.ConstantPool.MethodHandleEntry;
|
||||||
|
import com.sun.java.util.jar.pack.ConstantPool.MethodTypeEntry;
|
||||||
|
import com.sun.java.util.jar.pack.ConstantPool.InvokeDynamicEntry;
|
||||||
|
import com.sun.java.util.jar.pack.ConstantPool.BootstrapMethodEntry;
|
||||||
import com.sun.java.util.jar.pack.ConstantPool.SignatureEntry;
|
import com.sun.java.util.jar.pack.ConstantPool.SignatureEntry;
|
||||||
import com.sun.java.util.jar.pack.ConstantPool.Utf8Entry;
|
import com.sun.java.util.jar.pack.ConstantPool.Utf8Entry;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
@ -56,6 +60,10 @@ class TLGlobals {
|
|||||||
private final Map<String, SignatureEntry> signatureEntries;
|
private final Map<String, SignatureEntry> signatureEntries;
|
||||||
private final Map<String, DescriptorEntry> descriptorEntries;
|
private final Map<String, DescriptorEntry> descriptorEntries;
|
||||||
private final Map<String, MemberEntry> memberEntries;
|
private final Map<String, MemberEntry> memberEntries;
|
||||||
|
private final Map<String, MethodHandleEntry> methodHandleEntries;
|
||||||
|
private final Map<String, MethodTypeEntry> methodTypeEntries;
|
||||||
|
private final Map<String, InvokeDynamicEntry> invokeDynamicEntries;
|
||||||
|
private final Map<String, BootstrapMethodEntry> bootstrapMethodEntries;
|
||||||
|
|
||||||
TLGlobals() {
|
TLGlobals() {
|
||||||
utf8Entries = new HashMap<>();
|
utf8Entries = new HashMap<>();
|
||||||
@ -64,6 +72,10 @@ class TLGlobals {
|
|||||||
signatureEntries = new HashMap<>();
|
signatureEntries = new HashMap<>();
|
||||||
descriptorEntries = new HashMap<>();
|
descriptorEntries = new HashMap<>();
|
||||||
memberEntries = new HashMap<>();
|
memberEntries = new HashMap<>();
|
||||||
|
methodHandleEntries = new HashMap<>();
|
||||||
|
methodTypeEntries = new HashMap<>();
|
||||||
|
invokeDynamicEntries = new HashMap<>();
|
||||||
|
bootstrapMethodEntries = new HashMap<>();
|
||||||
props = new PropMap();
|
props = new PropMap();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -94,4 +106,20 @@ class TLGlobals {
|
|||||||
Map<String, MemberEntry> getMemberEntries() {
|
Map<String, MemberEntry> getMemberEntries() {
|
||||||
return memberEntries;
|
return memberEntries;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Map<String, MethodHandleEntry> getMethodHandleEntries() {
|
||||||
|
return methodHandleEntries;
|
||||||
|
}
|
||||||
|
|
||||||
|
Map<String, MethodTypeEntry> getMethodTypeEntries() {
|
||||||
|
return methodTypeEntries;
|
||||||
|
}
|
||||||
|
|
||||||
|
Map<String, InvokeDynamicEntry> getInvokeDynamicEntries() {
|
||||||
|
return invokeDynamicEntries;
|
||||||
|
}
|
||||||
|
|
||||||
|
Map<String, BootstrapMethodEntry> getBootstrapMethodEntries() {
|
||||||
|
return bootstrapMethodEntries;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
|
* Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
|
||||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||||
*
|
*
|
||||||
* This code is free software; you can redistribute it and/or modify it
|
* This code is free software; you can redistribute it and/or modify it
|
||||||
@ -60,7 +60,7 @@ class Utils {
|
|||||||
* If >3, print tons of comments (e.g., processing of references).
|
* If >3, print tons of comments (e.g., processing of references).
|
||||||
* (installer only)
|
* (installer only)
|
||||||
*/
|
*/
|
||||||
static final String DEBUG_VERBOSE = Utils.COM_PREFIX+"verbose";
|
static final String DEBUG_VERBOSE = COM_PREFIX+"verbose";
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Disables use of native code, prefers the Java-coded implementation.
|
* Disables use of native code, prefers the Java-coded implementation.
|
||||||
@ -134,35 +134,11 @@ class Utils {
|
|||||||
// to the engine code, especially the native code.
|
// to the engine code, especially the native code.
|
||||||
static final ThreadLocal<TLGlobals> currentInstance = new ThreadLocal<>();
|
static final ThreadLocal<TLGlobals> currentInstance = new ThreadLocal<>();
|
||||||
|
|
||||||
// convenience methods to access the TL globals
|
// convenience method to access the TL globals
|
||||||
static TLGlobals getTLGlobals() {
|
static TLGlobals getTLGlobals() {
|
||||||
return currentInstance.get();
|
return currentInstance.get();
|
||||||
}
|
}
|
||||||
|
|
||||||
static Map<String, Utf8Entry> getUtf8Entries() {
|
|
||||||
return getTLGlobals().getUtf8Entries();
|
|
||||||
}
|
|
||||||
|
|
||||||
static Map<String, ClassEntry> getClassEntries() {
|
|
||||||
return getTLGlobals().getClassEntries();
|
|
||||||
}
|
|
||||||
|
|
||||||
static Map<Object, LiteralEntry> getLiteralEntries() {
|
|
||||||
return getTLGlobals().getLiteralEntries();
|
|
||||||
}
|
|
||||||
|
|
||||||
static Map<String, DescriptorEntry> getDescriptorEntries() {
|
|
||||||
return getTLGlobals().getDescriptorEntries();
|
|
||||||
}
|
|
||||||
|
|
||||||
static Map<String, SignatureEntry> getSignatureEntries() {
|
|
||||||
return getTLGlobals().getSignatureEntries();
|
|
||||||
}
|
|
||||||
|
|
||||||
static Map<String, MemberEntry> getMemberEntries() {
|
|
||||||
return getTLGlobals().getMemberEntries();
|
|
||||||
}
|
|
||||||
|
|
||||||
static PropMap currentPropMap() {
|
static PropMap currentPropMap() {
|
||||||
Object obj = currentInstance.get();
|
Object obj = currentInstance.get();
|
||||||
if (obj instanceof PackerImpl)
|
if (obj instanceof PackerImpl)
|
||||||
@ -173,8 +149,19 @@ class Utils {
|
|||||||
}
|
}
|
||||||
|
|
||||||
static final boolean nolog
|
static final boolean nolog
|
||||||
= Boolean.getBoolean(Utils.COM_PREFIX+"nolog");
|
= Boolean.getBoolean(COM_PREFIX+"nolog");
|
||||||
|
|
||||||
|
static final boolean SORT_MEMBERS_DESCR_MAJOR
|
||||||
|
= Boolean.getBoolean(COM_PREFIX+"sort.members.descr.major");
|
||||||
|
|
||||||
|
static final boolean SORT_HANDLES_KIND_MAJOR
|
||||||
|
= Boolean.getBoolean(COM_PREFIX+"sort.handles.kind.major");
|
||||||
|
|
||||||
|
static final boolean SORT_INDY_BSS_MAJOR
|
||||||
|
= Boolean.getBoolean(COM_PREFIX+"sort.indy.bss.major");
|
||||||
|
|
||||||
|
static final boolean SORT_BSS_BSM_MAJOR
|
||||||
|
= Boolean.getBoolean(COM_PREFIX+"sort.bss.bsm.major");
|
||||||
|
|
||||||
static class Pack200Logger {
|
static class Pack200Logger {
|
||||||
private final String name;
|
private final String name;
|
||||||
|
@ -119,7 +119,12 @@ public final class SplashScreen {
|
|||||||
// SplashScreen class is now a singleton
|
// SplashScreen class is now a singleton
|
||||||
if (!wasClosed && theInstance == null) {
|
if (!wasClosed && theInstance == null) {
|
||||||
java.security.AccessController.doPrivileged(
|
java.security.AccessController.doPrivileged(
|
||||||
new sun.security.action.LoadLibraryAction("splashscreen"));
|
new java.security.PrivilegedAction<Void>() {
|
||||||
|
public Void run() {
|
||||||
|
System.loadLibrary("splashscreen");
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
});
|
||||||
long ptr = _getInstance();
|
long ptr = _getInstance();
|
||||||
if (ptr != 0 && _isVisible(ptr)) {
|
if (ptr != 0 && _isVisible(ptr)) {
|
||||||
theInstance = new SplashScreen(ptr);
|
theInstance = new SplashScreen(ptr);
|
||||||
|
@ -1646,7 +1646,12 @@ public abstract class Toolkit {
|
|||||||
static void loadLibraries() {
|
static void loadLibraries() {
|
||||||
if (!loaded) {
|
if (!loaded) {
|
||||||
java.security.AccessController.doPrivileged(
|
java.security.AccessController.doPrivileged(
|
||||||
new sun.security.action.LoadLibraryAction("awt"));
|
new java.security.PrivilegedAction<Void>() {
|
||||||
|
public Void run() {
|
||||||
|
System.loadLibrary("awt");
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
});
|
||||||
loaded = true;
|
loaded = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -54,6 +54,11 @@ class NativeLibLoader {
|
|||||||
*/
|
*/
|
||||||
static void loadLibraries() {
|
static void loadLibraries() {
|
||||||
java.security.AccessController.doPrivileged(
|
java.security.AccessController.doPrivileged(
|
||||||
new sun.security.action.LoadLibraryAction("awt"));
|
new java.security.PrivilegedAction<Void>() {
|
||||||
|
public Void run() {
|
||||||
|
System.loadLibrary("awt");
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -204,7 +204,12 @@ public abstract class ColorModel implements Transparency{
|
|||||||
static void loadLibraries() {
|
static void loadLibraries() {
|
||||||
if (!loaded) {
|
if (!loaded) {
|
||||||
java.security.AccessController.doPrivileged(
|
java.security.AccessController.doPrivileged(
|
||||||
new sun.security.action.LoadLibraryAction("awt"));
|
new java.security.PrivilegedAction<Void>() {
|
||||||
|
public Void run() {
|
||||||
|
System.loadLibrary("awt");
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
});
|
||||||
loaded = true;
|
loaded = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (c) 1996, 2011, Oracle and/or its affiliates. All rights reserved.
|
* Copyright (c) 1996, 2012, Oracle and/or its affiliates. All rights reserved.
|
||||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||||
*
|
*
|
||||||
* This code is free software; you can redistribute it and/or modify it
|
* This code is free software; you can redistribute it and/or modify it
|
||||||
@ -60,14 +60,19 @@ abstract class AbstractPlainDatagramSocketImpl extends DatagramSocketImpl
|
|||||||
/**
|
/**
|
||||||
* flag set if the native connect() call not to be used
|
* flag set if the native connect() call not to be used
|
||||||
*/
|
*/
|
||||||
private final static boolean connectDisabled = os.startsWith("Mac OS");
|
private final static boolean connectDisabled = os.contains("OS X");
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Load net library into runtime.
|
* Load net library into runtime.
|
||||||
*/
|
*/
|
||||||
static {
|
static {
|
||||||
java.security.AccessController.doPrivileged(
|
java.security.AccessController.doPrivileged(
|
||||||
new sun.security.action.LoadLibraryAction("net"));
|
new java.security.PrivilegedAction<Void>() {
|
||||||
|
public Void run() {
|
||||||
|
System.loadLibrary("net");
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -78,7 +78,12 @@ abstract class AbstractPlainSocketImpl extends SocketImpl
|
|||||||
*/
|
*/
|
||||||
static {
|
static {
|
||||||
java.security.AccessController.doPrivileged(
|
java.security.AccessController.doPrivileged(
|
||||||
new sun.security.action.LoadLibraryAction("net"));
|
new java.security.PrivilegedAction<Void>() {
|
||||||
|
public Void run() {
|
||||||
|
System.loadLibrary("net");
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -47,7 +47,12 @@ class DatagramPacket {
|
|||||||
*/
|
*/
|
||||||
static {
|
static {
|
||||||
java.security.AccessController.doPrivileged(
|
java.security.AccessController.doPrivileged(
|
||||||
new sun.security.action.LoadLibraryAction("net"));
|
new java.security.PrivilegedAction<Void>() {
|
||||||
|
public Void run() {
|
||||||
|
System.loadLibrary("net");
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
});
|
||||||
init();
|
init();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -234,7 +234,13 @@ class InetAddress implements java.io.Serializable {
|
|||||||
static {
|
static {
|
||||||
preferIPv6Address = java.security.AccessController.doPrivileged(
|
preferIPv6Address = java.security.AccessController.doPrivileged(
|
||||||
new GetBooleanAction("java.net.preferIPv6Addresses")).booleanValue();
|
new GetBooleanAction("java.net.preferIPv6Addresses")).booleanValue();
|
||||||
AccessController.doPrivileged(new LoadLibraryAction("net"));
|
AccessController.doPrivileged(
|
||||||
|
new java.security.PrivilegedAction<Void>() {
|
||||||
|
public Void run() {
|
||||||
|
System.loadLibrary("net");
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
});
|
||||||
init();
|
init();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -53,7 +53,14 @@ public final class NetworkInterface {
|
|||||||
private static final int defaultIndex; /* index of defaultInterface */
|
private static final int defaultIndex; /* index of defaultInterface */
|
||||||
|
|
||||||
static {
|
static {
|
||||||
AccessController.doPrivileged(new LoadLibraryAction("net"));
|
AccessController.doPrivileged(
|
||||||
|
new java.security.PrivilegedAction<Void>() {
|
||||||
|
public Void run() {
|
||||||
|
System.loadLibrary("net");
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
init();
|
init();
|
||||||
defaultInterface = DefaultInterface.getDefault();
|
defaultInterface = DefaultInterface.getDefault();
|
||||||
if (defaultInterface != null) {
|
if (defaultInterface != null) {
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
|
* Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
|
||||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||||
*
|
*
|
||||||
* This code is free software; you can redistribute it and/or modify it
|
* This code is free software; you can redistribute it and/or modify it
|
||||||
@ -609,7 +609,7 @@ class Bits { // package-private
|
|||||||
String arch = AccessController.doPrivileged(
|
String arch = AccessController.doPrivileged(
|
||||||
new sun.security.action.GetPropertyAction("os.arch"));
|
new sun.security.action.GetPropertyAction("os.arch"));
|
||||||
unaligned = arch.equals("i386") || arch.equals("x86")
|
unaligned = arch.equals("i386") || arch.equals("x86")
|
||||||
|| arch.equals("amd64");
|
|| arch.equals("amd64") || arch.equals("x86_64");
|
||||||
unalignedKnown = true;
|
unalignedKnown = true;
|
||||||
return unaligned;
|
return unaligned;
|
||||||
}
|
}
|
||||||
|
@ -54,7 +54,7 @@ import java.util.Iterator;
|
|||||||
* resolveSibling} methods to combine paths. The {@link #relativize relativize}
|
* resolveSibling} methods to combine paths. The {@link #relativize relativize}
|
||||||
* method that can be used to construct a relative path between two paths.
|
* method that can be used to construct a relative path between two paths.
|
||||||
* Paths can be {@link #compareTo compared}, and tested against each other using
|
* Paths can be {@link #compareTo compared}, and tested against each other using
|
||||||
* the {@link #startsWith startsWith} and {@link #endsWith endWith} methods.
|
* the {@link #startsWith startsWith} and {@link #endsWith endsWith} methods.
|
||||||
*
|
*
|
||||||
* <p> This interface extends {@link Watchable} interface so that a directory
|
* <p> This interface extends {@link Watchable} interface so that a directory
|
||||||
* located by a path can be {@link #register registered} with a {@link
|
* located by a path can be {@link #register registered} with a {@link
|
||||||
|
@ -647,6 +647,8 @@ public class DateFormatSymbols implements Serializable, Cloneable {
|
|||||||
private static final ConcurrentMap<Locale, SoftReference<DateFormatSymbols>> cachedInstances
|
private static final ConcurrentMap<Locale, SoftReference<DateFormatSymbols>> cachedInstances
|
||||||
= new ConcurrentHashMap<Locale, SoftReference<DateFormatSymbols>>(3);
|
= new ConcurrentHashMap<Locale, SoftReference<DateFormatSymbols>>(3);
|
||||||
|
|
||||||
|
private transient int lastZoneIndex = 0;
|
||||||
|
|
||||||
private void initializeData(Locale desiredLocale) {
|
private void initializeData(Locale desiredLocale) {
|
||||||
locale = desiredLocale;
|
locale = desiredLocale;
|
||||||
|
|
||||||
@ -692,12 +694,24 @@ public class DateFormatSymbols implements Serializable, Cloneable {
|
|||||||
* the given time zone ID can't be located in the DateFormatSymbols object.
|
* the given time zone ID can't be located in the DateFormatSymbols object.
|
||||||
* @see java.util.SimpleTimeZone
|
* @see java.util.SimpleTimeZone
|
||||||
*/
|
*/
|
||||||
final int getZoneIndex(String ID)
|
final int getZoneIndex(String ID) {
|
||||||
{
|
|
||||||
String[][] zoneStrings = getZoneStringsWrapper();
|
String[][] zoneStrings = getZoneStringsWrapper();
|
||||||
for (int index=0; index<zoneStrings.length; index++)
|
|
||||||
{
|
/*
|
||||||
if (ID.equals(zoneStrings[index][0])) return index;
|
* getZoneIndex has been re-written for performance reasons. instead of
|
||||||
|
* traversing the zoneStrings array every time, we cache the last used zone
|
||||||
|
* index
|
||||||
|
*/
|
||||||
|
if (lastZoneIndex < zoneStrings.length && ID.equals(zoneStrings[lastZoneIndex][0])) {
|
||||||
|
return lastZoneIndex;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* slow path, search entire list */
|
||||||
|
for (int index = 0; index < zoneStrings.length; index++) {
|
||||||
|
if (ID.equals(zoneStrings[index][0])) {
|
||||||
|
lastZoneIndex = index;
|
||||||
|
return index;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return -1;
|
return -1;
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (c) 2000, 2008, Oracle and/or its affiliates. All rights reserved.
|
* Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
|
||||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||||
*
|
*
|
||||||
* This code is free software; you can redistribute it and/or modify it
|
* This code is free software; you can redistribute it and/or modify it
|
||||||
@ -293,7 +293,7 @@ public abstract class Preferences {
|
|||||||
String platformFactory;
|
String platformFactory;
|
||||||
if (osName.startsWith("Windows")) {
|
if (osName.startsWith("Windows")) {
|
||||||
platformFactory = "java.util.prefs.WindowsPreferencesFactory";
|
platformFactory = "java.util.prefs.WindowsPreferencesFactory";
|
||||||
} else if (osName.startsWith("Mac OS X")) {
|
} else if (osName.contains("OS X")) {
|
||||||
platformFactory = "java.util.prefs.MacOSXPreferencesFactory";
|
platformFactory = "java.util.prefs.MacOSXPreferencesFactory";
|
||||||
} else {
|
} else {
|
||||||
platformFactory = "java.util.prefs.FileSystemPreferencesFactory";
|
platformFactory = "java.util.prefs.FileSystemPreferencesFactory";
|
||||||
|
@ -145,7 +145,7 @@ public class SSLContext {
|
|||||||
* @return the new <code>SSLContext</code> object.
|
* @return the new <code>SSLContext</code> object.
|
||||||
*
|
*
|
||||||
* @exception NoSuchAlgorithmException if no Provider supports a
|
* @exception NoSuchAlgorithmException if no Provider supports a
|
||||||
* TrustManagerFactorySpi implementation for the
|
* SSLContextSpi implementation for the
|
||||||
* specified protocol.
|
* specified protocol.
|
||||||
* @exception NullPointerException if protocol is null.
|
* @exception NullPointerException if protocol is null.
|
||||||
*
|
*
|
||||||
@ -222,11 +222,11 @@ public class SSLContext {
|
|||||||
*
|
*
|
||||||
* @return the new <code>SSLContext</code> object.
|
* @return the new <code>SSLContext</code> object.
|
||||||
*
|
*
|
||||||
* @throws NoSuchAlgorithmException if a KeyManagerFactorySpi
|
* @throws NoSuchAlgorithmException if a SSLContextSpi
|
||||||
* implementation for the specified protocol is not available
|
* implementation for the specified protocol is not available
|
||||||
* from the specified Provider object.
|
* from the specified Provider object.
|
||||||
*
|
*
|
||||||
* @throws IllegalArgumentException if the provider name is null.
|
* @throws IllegalArgumentException if the provider is null.
|
||||||
* @throws NullPointerException if protocol is null.
|
* @throws NullPointerException if protocol is null.
|
||||||
*
|
*
|
||||||
* @see java.security.Provider
|
* @see java.security.Provider
|
||||||
|
@ -54,6 +54,11 @@ class NativeLibLoader {
|
|||||||
*/
|
*/
|
||||||
static void loadLibraries() {
|
static void loadLibraries() {
|
||||||
java.security.AccessController.doPrivileged(
|
java.security.AccessController.doPrivileged(
|
||||||
new sun.security.action.LoadLibraryAction("awt"));
|
new java.security.PrivilegedAction<Void>() {
|
||||||
|
public Void run() {
|
||||||
|
System.loadLibrary("awt");
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (c) 1997, 2006, Oracle and/or its affiliates. All rights reserved.
|
* Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
|
||||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||||
*
|
*
|
||||||
* This code is free software; you can redistribute it and/or modify it
|
* This code is free software; you can redistribute it and/or modify it
|
||||||
@ -101,7 +101,7 @@ public class OSInfo {
|
|||||||
return SOLARIS;
|
return SOLARIS;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (osName.startsWith("Mac OS X")) {
|
if (osName.contains("OS X")) {
|
||||||
return MACOSX;
|
return MACOSX;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -54,7 +54,12 @@ public class JPEGImageDecoder extends ImageDecoder {
|
|||||||
|
|
||||||
static {
|
static {
|
||||||
java.security.AccessController.doPrivileged(
|
java.security.AccessController.doPrivileged(
|
||||||
new sun.security.action.LoadLibraryAction("jpeg"));
|
new java.security.PrivilegedAction<Void>() {
|
||||||
|
public Void run() {
|
||||||
|
System.loadLibrary("jpeg");
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
});
|
||||||
initIDs(InputStreamClass);
|
initIDs(InputStreamClass);
|
||||||
RGBcolormodel = new DirectColorModel(24, 0xff0000, 0xff00, 0xff);
|
RGBcolormodel = new DirectColorModel(24, 0xff0000, 0xff00, 0xff);
|
||||||
ARGBcolormodel = ColorModel.getRGBdefault();
|
ARGBcolormodel = ColorModel.getRGBdefault();
|
||||||
|
@ -53,7 +53,12 @@ class NativeLibLoader {
|
|||||||
* that the name of the library is "awt". -br.
|
* that the name of the library is "awt". -br.
|
||||||
*/
|
*/
|
||||||
static void loadLibraries() {
|
static void loadLibraries() {
|
||||||
java.security.AccessController.doPrivileged
|
java.security.AccessController.doPrivileged(
|
||||||
(new sun.security.action.LoadLibraryAction("awt"));
|
new java.security.PrivilegedAction<Void>() {
|
||||||
|
public Void run() {
|
||||||
|
System.loadLibrary("awt");
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
|
* Copyright (c) 2008, 2012, Oracle and/or its affiliates. All rights reserved.
|
||||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||||
*
|
*
|
||||||
* This code is free software; you can redistribute it and/or modify it
|
* This code is free software; you can redistribute it and/or modify it
|
||||||
@ -78,7 +78,7 @@ public final class FontUtilities {
|
|||||||
|
|
||||||
isLinux = osName.startsWith("Linux");
|
isLinux = osName.startsWith("Linux");
|
||||||
|
|
||||||
isMacOSX = osName.startsWith("Mac OS X"); // TODO: MacOSX
|
isMacOSX = osName.contains("OS X"); // TODO: MacOSX
|
||||||
|
|
||||||
String t2kStr = System.getProperty("sun.java2d.font.scaler");
|
String t2kStr = System.getProperty("sun.java2d.font.scaler");
|
||||||
if (t2kStr != null) {
|
if (t2kStr != null) {
|
||||||
|
@ -57,7 +57,12 @@ public class Disposer implements Runnable {
|
|||||||
|
|
||||||
static {
|
static {
|
||||||
java.security.AccessController.doPrivileged(
|
java.security.AccessController.doPrivileged(
|
||||||
new sun.security.action.LoadLibraryAction("awt"));
|
new java.security.PrivilegedAction<Void>() {
|
||||||
|
public Void run() {
|
||||||
|
System.loadLibrary("awt");
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
});
|
||||||
initIDs();
|
initIDs();
|
||||||
String type = (String) java.security.AccessController.doPrivileged(
|
String type = (String) java.security.AccessController.doPrivileged(
|
||||||
new sun.security.action.GetPropertyAction("sun.java2d.reftype"));
|
new sun.security.action.GetPropertyAction("sun.java2d.reftype"));
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
|
* Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved.
|
||||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||||
*
|
*
|
||||||
* This code is free software; you can redistribute it and/or modify it
|
* This code is free software; you can redistribute it and/or modify it
|
||||||
@ -381,7 +381,7 @@ public enum LauncherHelper {
|
|||||||
PrintStream ostream = (printToStderr) ? System.err : System.out;
|
PrintStream ostream = (printToStderr) ? System.err : System.out;
|
||||||
ostream.println(getLocalizedMessage("java.launcher.X.usage",
|
ostream.println(getLocalizedMessage("java.launcher.X.usage",
|
||||||
File.pathSeparator));
|
File.pathSeparator));
|
||||||
if (System.getProperty("os.name").startsWith("Mac OS")) {
|
if (System.getProperty("os.name").contains("OS X")) {
|
||||||
ostream.println(getLocalizedMessage("java.launcher.X.macosx.usage",
|
ostream.println(getLocalizedMessage("java.launcher.X.macosx.usage",
|
||||||
File.pathSeparator));
|
File.pathSeparator));
|
||||||
}
|
}
|
||||||
|
@ -37,7 +37,6 @@ import javax.management.RuntimeOperationsException;
|
|||||||
import java.security.AccessController;
|
import java.security.AccessController;
|
||||||
import java.security.PrivilegedActionException;
|
import java.security.PrivilegedActionException;
|
||||||
import java.security.PrivilegedExceptionAction;
|
import java.security.PrivilegedExceptionAction;
|
||||||
import sun.security.action.LoadLibraryAction;
|
|
||||||
|
|
||||||
import sun.util.logging.LoggingSupport;
|
import sun.util.logging.LoggingSupport;
|
||||||
|
|
||||||
@ -422,7 +421,13 @@ public class ManagementFactoryHelper {
|
|||||||
}
|
}
|
||||||
|
|
||||||
static {
|
static {
|
||||||
AccessController.doPrivileged(new LoadLibraryAction("management"));
|
AccessController.doPrivileged(
|
||||||
|
new java.security.PrivilegedAction<Void>() {
|
||||||
|
public Void run() {
|
||||||
|
System.loadLibrary("management");
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
});
|
||||||
jvm = new VMManagementImpl();
|
jvm = new VMManagementImpl();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -76,6 +76,11 @@ public final class SdpSupport {
|
|||||||
|
|
||||||
static {
|
static {
|
||||||
AccessController.doPrivileged(
|
AccessController.doPrivileged(
|
||||||
new sun.security.action.LoadLibraryAction("net"));
|
new java.security.PrivilegedAction<Void>() {
|
||||||
|
public Void run() {
|
||||||
|
System.loadLibrary("net");
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -95,7 +95,12 @@ public class DefaultProxySelector extends ProxySelector {
|
|||||||
}});
|
}});
|
||||||
if (b != null && b.booleanValue()) {
|
if (b != null && b.booleanValue()) {
|
||||||
java.security.AccessController.doPrivileged(
|
java.security.AccessController.doPrivileged(
|
||||||
new sun.security.action.LoadLibraryAction("net"));
|
new java.security.PrivilegedAction<Void>() {
|
||||||
|
public Void run() {
|
||||||
|
System.loadLibrary("net");
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
});
|
||||||
hasSystemProxies = init();
|
hasSystemProxies = init();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -744,7 +744,8 @@ class DatagramChannelImpl
|
|||||||
if (sm != null)
|
if (sm != null)
|
||||||
sm.checkConnect(isa.getAddress().getHostAddress(),
|
sm.checkConnect(isa.getAddress().getHostAddress(),
|
||||||
isa.getPort());
|
isa.getPort());
|
||||||
disconnect0(fd);
|
boolean isIPv6 = (family == StandardProtocolFamily.INET6);
|
||||||
|
disconnect0(fd, isIPv6);
|
||||||
remoteAddress = null;
|
remoteAddress = null;
|
||||||
state = ST_UNCONNECTED;
|
state = ST_UNCONNECTED;
|
||||||
|
|
||||||
@ -1079,7 +1080,7 @@ class DatagramChannelImpl
|
|||||||
|
|
||||||
private static native void initIDs();
|
private static native void initIDs();
|
||||||
|
|
||||||
private static native void disconnect0(FileDescriptor fd)
|
private static native void disconnect0(FileDescriptor fd, boolean isIPv6)
|
||||||
throws IOException;
|
throws IOException;
|
||||||
|
|
||||||
private native int receive0(FileDescriptor fd, long address, int len,
|
private native int receive0(FileDescriptor fd, long address, int len,
|
||||||
|
@ -472,10 +472,15 @@ public class Util {
|
|||||||
if (loaded)
|
if (loaded)
|
||||||
return;
|
return;
|
||||||
loaded = true;
|
loaded = true;
|
||||||
java.security.AccessController
|
java.security.AccessController.doPrivileged(
|
||||||
.doPrivileged(new sun.security.action.LoadLibraryAction("net"));
|
new java.security.PrivilegedAction<Void>() {
|
||||||
java.security.AccessController
|
public Void run() {
|
||||||
.doPrivileged(new sun.security.action.LoadLibraryAction("nio"));
|
System.loadLibrary("net");
|
||||||
|
System.loadLibrary("nio");
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
// IOUtil must be initialized; Its native methods are called from
|
// IOUtil must be initialized; Its native methods are called from
|
||||||
// other places in native nio code so they must be set up.
|
// other places in native nio code so they must be set up.
|
||||||
IOUtil.initIDs();
|
IOUtil.initIDs();
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved.
|
* Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved.
|
||||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||||
*
|
*
|
||||||
* This code is free software; you can redistribute it and/or modify it
|
* This code is free software; you can redistribute it and/or modify it
|
||||||
@ -1280,7 +1280,7 @@ public class ExtendedCharsets
|
|||||||
String osName = AccessController.doPrivileged(
|
String osName = AccessController.doPrivileged(
|
||||||
new GetPropertyAction("os.name"));
|
new GetPropertyAction("os.name"));
|
||||||
if ("SunOS".equals(osName) || "Linux".equals(osName)
|
if ("SunOS".equals(osName) || "Linux".equals(osName)
|
||||||
|| osName.startsWith("Mac OS")) {
|
|| osName.contains("OS X")) {
|
||||||
charset("x-COMPOUND_TEXT", "COMPOUND_TEXT",
|
charset("x-COMPOUND_TEXT", "COMPOUND_TEXT",
|
||||||
new String[] {
|
new String[] {
|
||||||
"COMPOUND_TEXT", // JDK historical
|
"COMPOUND_TEXT", // JDK historical
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (c) 1998, 2008, Oracle and/or its affiliates. All rights reserved.
|
* Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
|
||||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||||
*
|
*
|
||||||
* This code is free software; you can redistribute it and/or modify it
|
* This code is free software; you can redistribute it and/or modify it
|
||||||
@ -1567,7 +1567,7 @@ public class PSPrinterJob extends RasterPrinterJob {
|
|||||||
}
|
}
|
||||||
|
|
||||||
String osname = System.getProperty("os.name");
|
String osname = System.getProperty("os.name");
|
||||||
if (osname.equals("Linux") || osname.startsWith("Mac OS X")) {
|
if (osname.equals("Linux") || osname.contains("OS X")) {
|
||||||
execCmd = new String[ncomps];
|
execCmd = new String[ncomps];
|
||||||
execCmd[n++] = "/usr/bin/lpr";
|
execCmd[n++] = "/usr/bin/lpr";
|
||||||
if ((pFlags & PRINTER) != 0) {
|
if ((pFlags & PRINTER) != 0) {
|
||||||
|
@ -1,70 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (c) 1998, 2006, Oracle and/or its affiliates. All rights reserved.
|
|
||||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
|
||||||
*
|
|
||||||
* This code is free software; you can redistribute it and/or modify it
|
|
||||||
* under the terms of the GNU General Public License version 2 only, as
|
|
||||||
* published by the Free Software Foundation. Oracle designates this
|
|
||||||
* particular file as subject to the "Classpath" exception as provided
|
|
||||||
* by Oracle in the LICENSE file that accompanied this code.
|
|
||||||
*
|
|
||||||
* This code is distributed in the hope that it will be useful, but WITHOUT
|
|
||||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
|
||||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
|
||||||
* version 2 for more details (a copy is included in the LICENSE file that
|
|
||||||
* accompanied this code).
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License version
|
|
||||||
* 2 along with this work; if not, write to the Free Software Foundation,
|
|
||||||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
|
||||||
*
|
|
||||||
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
|
|
||||||
* or visit www.oracle.com if you need additional information or have any
|
|
||||||
* questions.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package sun.security.action;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* A convenience class for loading a system library as a privileged action.
|
|
||||||
*
|
|
||||||
* <p>An instance of this class can be used as the argument of
|
|
||||||
* <code>AccessController.doPrivileged</code>.
|
|
||||||
*
|
|
||||||
* <p>The following code attempts to load the system library named
|
|
||||||
* <code>"lib"</code> as a privileged action: <p>
|
|
||||||
*
|
|
||||||
* <pre>
|
|
||||||
* java.security.AccessController.doPrivileged(new LoadLibraryAction("lib"));
|
|
||||||
* </pre>
|
|
||||||
*
|
|
||||||
* @author Roland Schemers
|
|
||||||
* @see java.security.PrivilegedAction
|
|
||||||
* @see java.security.AccessController
|
|
||||||
* @since 1.2
|
|
||||||
*/
|
|
||||||
|
|
||||||
public class LoadLibraryAction implements java.security.PrivilegedAction<Void> {
|
|
||||||
private String theLib;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Constructor that takes the name of the system library that needs to be
|
|
||||||
* loaded.
|
|
||||||
*
|
|
||||||
* <p>The manner in which a library name is mapped to the
|
|
||||||
* actual system library is system dependent.
|
|
||||||
*
|
|
||||||
* @param theLib the name of the library.
|
|
||||||
*/
|
|
||||||
public LoadLibraryAction(String theLib) {
|
|
||||||
this.theLib = theLib;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Loads the system library whose name was specified in the constructor.
|
|
||||||
*/
|
|
||||||
public Void run() {
|
|
||||||
System.loadLibrary(theLib);
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
|
* Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
|
||||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||||
*
|
*
|
||||||
* This code is free software; you can redistribute it and/or modify it
|
* This code is free software; you can redistribute it and/or modify it
|
||||||
@ -90,7 +90,7 @@ public final class SunNativeProvider extends Provider {
|
|||||||
"libgssapi_krb5.so",
|
"libgssapi_krb5.so",
|
||||||
"libgssapi_krb5.so.2",
|
"libgssapi_krb5.so.2",
|
||||||
};
|
};
|
||||||
} else if (osname.startsWith("Mac OS X")) {
|
} else if (osname.contains("OS X")) {
|
||||||
gssLibs = new String[]{
|
gssLibs = new String[]{
|
||||||
"/usr/lib/sasl2/libgssapiv2.2.so",
|
"/usr/lib/sasl2/libgssapiv2.2.so",
|
||||||
};
|
};
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
|
* Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
|
||||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||||
*
|
*
|
||||||
* This code is free software; you can redistribute it and/or modify it
|
* This code is free software; you can redistribute it and/or modify it
|
||||||
@ -737,7 +737,7 @@ public class Config {
|
|||||||
}
|
}
|
||||||
} else if (osname.startsWith("SunOS")) {
|
} else if (osname.startsWith("SunOS")) {
|
||||||
name = "/etc/krb5/krb5.conf";
|
name = "/etc/krb5/krb5.conf";
|
||||||
} else if (osname.startsWith("Mac")) {
|
} else if (osname.contains("OS X")) {
|
||||||
if (isMacosLionOrBetter()) return "";
|
if (isMacosLionOrBetter()) return "";
|
||||||
name = findMacosConfigFile();
|
name = findMacosConfigFile();
|
||||||
} else {
|
} else {
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
|
* Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
|
||||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||||
*
|
*
|
||||||
* This code is free software; you can redistribute it and/or modify it
|
* This code is free software; you can redistribute it and/or modify it
|
||||||
@ -289,7 +289,7 @@ public class Credentials {
|
|||||||
String os = java.security.AccessController.doPrivileged(
|
String os = java.security.AccessController.doPrivileged(
|
||||||
new sun.security.action.GetPropertyAction("os.name"));
|
new sun.security.action.GetPropertyAction("os.name"));
|
||||||
if (os.toUpperCase(Locale.ENGLISH).startsWith("WINDOWS") ||
|
if (os.toUpperCase(Locale.ENGLISH).startsWith("WINDOWS") ||
|
||||||
os.toUpperCase(Locale.ENGLISH).startsWith("MAC")) {
|
os.toUpperCase(Locale.ENGLISH).contains("OS X")) {
|
||||||
Credentials creds = acquireDefaultCreds();
|
Credentials creds = acquireDefaultCreds();
|
||||||
if (creds == null) {
|
if (creds == null) {
|
||||||
if (DEBUG) {
|
if (DEBUG) {
|
||||||
@ -478,7 +478,7 @@ public class Credentials {
|
|||||||
java.security.AccessController.doPrivileged(
|
java.security.AccessController.doPrivileged(
|
||||||
new java.security.PrivilegedAction<Void> () {
|
new java.security.PrivilegedAction<Void> () {
|
||||||
public Void run() {
|
public Void run() {
|
||||||
if (System.getProperty("os.name").startsWith("Mac")) {
|
if (System.getProperty("os.name").contains("OS X")) {
|
||||||
System.loadLibrary("osxkrb5");
|
System.loadLibrary("osxkrb5");
|
||||||
} else {
|
} else {
|
||||||
System.loadLibrary("w2k_lsa_auth");
|
System.loadLibrary("w2k_lsa_auth");
|
||||||
|
@ -36,7 +36,13 @@ public class SCDynamicStoreConfig {
|
|||||||
private static native Hashtable<String, Object> getKerberosConfig();
|
private static native Hashtable<String, Object> getKerberosConfig();
|
||||||
|
|
||||||
static {
|
static {
|
||||||
java.security.AccessController.doPrivileged(new sun.security.action.LoadLibraryAction("osx"));
|
java.security.AccessController.doPrivileged(
|
||||||
|
new java.security.PrivilegedAction<Void>() {
|
||||||
|
public Void run() {
|
||||||
|
System.loadLibrary("osx");
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
});
|
||||||
installNotificationCallback();
|
installNotificationCallback();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
|
* Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
|
||||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||||
*
|
*
|
||||||
* This code is free software; you can redistribute it and/or modify it
|
* This code is free software; you can redistribute it and/or modify it
|
||||||
@ -95,7 +95,8 @@ final class ByteArrayAccess {
|
|||||||
private static boolean unaligned() {
|
private static boolean unaligned() {
|
||||||
String arch = java.security.AccessController.doPrivileged
|
String arch = java.security.AccessController.doPrivileged
|
||||||
(new sun.security.action.GetPropertyAction("os.arch", ""));
|
(new sun.security.action.GetPropertyAction("os.arch", ""));
|
||||||
return arch.equals("i386") || arch.equals("x86") || arch.equals("amd64");
|
return arch.equals("i386") || arch.equals("x86") || arch.equals("amd64")
|
||||||
|
|| arch.equals("x86_64");
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -27,8 +27,6 @@ package sun.security.smartcardio;
|
|||||||
|
|
||||||
import java.security.AccessController;
|
import java.security.AccessController;
|
||||||
|
|
||||||
import sun.security.action.LoadLibraryAction;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Access to native PC/SC functions and definition of PC/SC constants.
|
* Access to native PC/SC functions and definition of PC/SC constants.
|
||||||
* Initialization and platform specific PC/SC constants are handled in
|
* Initialization and platform specific PC/SC constants are handled in
|
||||||
|
@ -59,10 +59,10 @@ public class DisabledAlgorithmConstraints implements AlgorithmConstraints {
|
|||||||
public final static String PROPERTY_TLS_DISABLED_ALGS =
|
public final static String PROPERTY_TLS_DISABLED_ALGS =
|
||||||
"jdk.tls.disabledAlgorithms";
|
"jdk.tls.disabledAlgorithms";
|
||||||
|
|
||||||
private static Map<String, String[]> disabledAlgorithmsMap =
|
private final static Map<String, String[]> disabledAlgorithmsMap =
|
||||||
Collections.synchronizedMap(new HashMap<String, String[]>());
|
new HashMap<>();
|
||||||
private static Map<String, KeySizeConstraints> keySizeConstraintsMap =
|
private final static Map<String, KeySizeConstraints> keySizeConstraintsMap =
|
||||||
Collections.synchronizedMap(new HashMap<String, KeySizeConstraints>());
|
new HashMap<>();
|
||||||
|
|
||||||
private String[] disabledAlgorithms;
|
private String[] disabledAlgorithms;
|
||||||
private KeySizeConstraints keySizeConstraints;
|
private KeySizeConstraints keySizeConstraints;
|
||||||
@ -74,6 +74,8 @@ public class DisabledAlgorithmConstraints implements AlgorithmConstraints {
|
|||||||
* algorithm constraints
|
* algorithm constraints
|
||||||
*/
|
*/
|
||||||
public DisabledAlgorithmConstraints(String propertyName) {
|
public DisabledAlgorithmConstraints(String propertyName) {
|
||||||
|
// Both disabledAlgorithmsMap and keySizeConstraintsMap are
|
||||||
|
// synchronized with the lock of disabledAlgorithmsMap.
|
||||||
synchronized (disabledAlgorithmsMap) {
|
synchronized (disabledAlgorithmsMap) {
|
||||||
if(!disabledAlgorithmsMap.containsKey(propertyName)) {
|
if(!disabledAlgorithmsMap.containsKey(propertyName)) {
|
||||||
loadDisabledAlgorithmsMap(propertyName);
|
loadDisabledAlgorithmsMap(propertyName);
|
||||||
|
@ -36,7 +36,12 @@ class JVM {
|
|||||||
|
|
||||||
static {
|
static {
|
||||||
java.security.AccessController.doPrivileged(
|
java.security.AccessController.doPrivileged(
|
||||||
new sun.security.action.LoadLibraryAction("jsdt"));
|
new java.security.PrivilegedAction<Void>() {
|
||||||
|
public Void run() {
|
||||||
|
System.loadLibrary("jsdt");
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
static long activate(String moduleName, DTraceProvider[] providers) {
|
static long activate(String moduleName, DTraceProvider[] providers) {
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (c) 2002, 2009, Oracle and/or its affiliates. All rights reserved.
|
* Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved.
|
||||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||||
*
|
*
|
||||||
* This code is free software; you can redistribute it and/or modify it
|
* This code is free software; you can redistribute it and/or modify it
|
||||||
@ -188,9 +188,13 @@ void band::setIndexByTag(byte tag) {
|
|||||||
entry* band::getRefCommon(cpindex* ix_, bool nullOKwithCaller) {
|
entry* band::getRefCommon(cpindex* ix_, bool nullOKwithCaller) {
|
||||||
CHECK_0;
|
CHECK_0;
|
||||||
assert(ix_->ixTag == ixTag
|
assert(ix_->ixTag == ixTag
|
||||||
|| (ixTag == CONSTANT_Literal
|
|| ((ixTag == CONSTANT_All ||
|
||||||
&& ix_->ixTag >= CONSTANT_Integer
|
ixTag == CONSTANT_LoadableValue ||
|
||||||
&& ix_->ixTag <= CONSTANT_String));
|
ixTag == CONSTANT_AnyMember)
|
||||||
|
|| (ixTag == CONSTANT_FieldSpecific &&
|
||||||
|
ix_->ixTag >= CONSTANT_Integer &&
|
||||||
|
ix_->ixTag <= CONSTANT_String))
|
||||||
|
);
|
||||||
int n = vs[0].getInt() - nullOK;
|
int n = vs[0].getInt() - nullOK;
|
||||||
// Note: band-local nullOK means null encodes as 0.
|
// Note: band-local nullOK means null encodes as 0.
|
||||||
// But nullOKwithCaller means caller is willing to tolerate a null.
|
// But nullOKwithCaller means caller is willing to tolerate a null.
|
||||||
@ -270,22 +274,15 @@ int band::getIntCount(int tag) {
|
|||||||
#define NO_INDEX 0
|
#define NO_INDEX 0
|
||||||
|
|
||||||
struct band_init {
|
struct band_init {
|
||||||
#ifndef PRODUCT
|
|
||||||
int bn;
|
int bn;
|
||||||
const char* name;
|
const char* name;
|
||||||
#endif
|
|
||||||
int defc;
|
int defc;
|
||||||
int index;
|
int index;
|
||||||
};
|
};
|
||||||
|
|
||||||
#ifdef PRODUCT
|
|
||||||
#define BAND_INIT(name, cspec, ix) \
|
|
||||||
{ cspec, ix }
|
|
||||||
#else
|
|
||||||
#define BAND_INIT(name, cspec, ix) \
|
#define BAND_INIT(name, cspec, ix) \
|
||||||
{ e_##name, #name, /*debug only*/ \
|
{ e_##name, #name, /*debug only*/ \
|
||||||
cspec, ix }
|
cspec, ix }
|
||||||
#endif
|
|
||||||
|
|
||||||
const band_init all_band_inits[] = {
|
const band_init all_band_inits[] = {
|
||||||
//BAND_INIT(archive_magic, BYTE1_spec, 0),
|
//BAND_INIT(archive_magic, BYTE1_spec, 0),
|
||||||
@ -314,6 +311,14 @@ const band_init all_band_inits[] = {
|
|||||||
BAND_INIT(cp_Method_desc, UDELTA5_spec, INDEX(CONSTANT_NameandType)),
|
BAND_INIT(cp_Method_desc, UDELTA5_spec, INDEX(CONSTANT_NameandType)),
|
||||||
BAND_INIT(cp_Imethod_class, DELTA5_spec, INDEX(CONSTANT_Class)),
|
BAND_INIT(cp_Imethod_class, DELTA5_spec, INDEX(CONSTANT_Class)),
|
||||||
BAND_INIT(cp_Imethod_desc, UDELTA5_spec, INDEX(CONSTANT_NameandType)),
|
BAND_INIT(cp_Imethod_desc, UDELTA5_spec, INDEX(CONSTANT_NameandType)),
|
||||||
|
BAND_INIT(cp_MethodHandle_refkind, DELTA5_spec, 0),
|
||||||
|
BAND_INIT(cp_MethodHandle_member, UDELTA5_spec, INDEX(CONSTANT_AnyMember)),
|
||||||
|
BAND_INIT(cp_MethodType, UDELTA5_spec, INDEX(CONSTANT_Signature)),
|
||||||
|
BAND_INIT(cp_BootstrapMethod_ref, DELTA5_spec, INDEX(CONSTANT_MethodHandle)),
|
||||||
|
BAND_INIT(cp_BootstrapMethod_arg_count, UDELTA5_spec, 0),
|
||||||
|
BAND_INIT(cp_BootstrapMethod_arg, DELTA5_spec, INDEX(CONSTANT_LoadableValue)),
|
||||||
|
BAND_INIT(cp_InvokeDynamic_spec, DELTA5_spec, INDEX(CONSTANT_BootstrapMethod)),
|
||||||
|
BAND_INIT(cp_InvokeDynamic_desc, UDELTA5_spec, INDEX(CONSTANT_NameandType)),
|
||||||
BAND_INIT(attr_definition_headers, BYTE1_spec, 0),
|
BAND_INIT(attr_definition_headers, BYTE1_spec, 0),
|
||||||
BAND_INIT(attr_definition_name, UNSIGNED5_spec, INDEX(CONSTANT_Utf8)),
|
BAND_INIT(attr_definition_name, UNSIGNED5_spec, INDEX(CONSTANT_Utf8)),
|
||||||
BAND_INIT(attr_definition_layout, UNSIGNED5_spec, INDEX(CONSTANT_Utf8)),
|
BAND_INIT(attr_definition_layout, UNSIGNED5_spec, INDEX(CONSTANT_Utf8)),
|
||||||
@ -333,7 +338,7 @@ const band_init all_band_inits[] = {
|
|||||||
BAND_INIT(field_attr_count, UNSIGNED5_spec, 0),
|
BAND_INIT(field_attr_count, UNSIGNED5_spec, 0),
|
||||||
BAND_INIT(field_attr_indexes, UNSIGNED5_spec, 0),
|
BAND_INIT(field_attr_indexes, UNSIGNED5_spec, 0),
|
||||||
BAND_INIT(field_attr_calls, UNSIGNED5_spec, 0),
|
BAND_INIT(field_attr_calls, UNSIGNED5_spec, 0),
|
||||||
BAND_INIT(field_ConstantValue_KQ, UNSIGNED5_spec, INDEX(CONSTANT_Literal)),
|
BAND_INIT(field_ConstantValue_KQ, UNSIGNED5_spec, INDEX(CONSTANT_FieldSpecific)),
|
||||||
BAND_INIT(field_Signature_RS, UNSIGNED5_spec, INDEX(CONSTANT_Signature)),
|
BAND_INIT(field_Signature_RS, UNSIGNED5_spec, INDEX(CONSTANT_Signature)),
|
||||||
BAND_INIT(field_metadata_bands, -1, -1),
|
BAND_INIT(field_metadata_bands, -1, -1),
|
||||||
BAND_INIT(field_attr_bands, -1, -1),
|
BAND_INIT(field_attr_bands, -1, -1),
|
||||||
@ -415,10 +420,12 @@ const band_init all_band_inits[] = {
|
|||||||
BAND_INIT(bc_longref, DELTA5_spec, INDEX(CONSTANT_Long)),
|
BAND_INIT(bc_longref, DELTA5_spec, INDEX(CONSTANT_Long)),
|
||||||
BAND_INIT(bc_doubleref, DELTA5_spec, INDEX(CONSTANT_Double)),
|
BAND_INIT(bc_doubleref, DELTA5_spec, INDEX(CONSTANT_Double)),
|
||||||
BAND_INIT(bc_stringref, DELTA5_spec, INDEX(CONSTANT_String)),
|
BAND_INIT(bc_stringref, DELTA5_spec, INDEX(CONSTANT_String)),
|
||||||
|
BAND_INIT(bc_loadablevalueref, DELTA5_spec, INDEX(CONSTANT_LoadableValue)),
|
||||||
BAND_INIT(bc_classref, UNSIGNED5_spec, NULL_OR_INDEX(CONSTANT_Class)),
|
BAND_INIT(bc_classref, UNSIGNED5_spec, NULL_OR_INDEX(CONSTANT_Class)),
|
||||||
BAND_INIT(bc_fieldref, DELTA5_spec, INDEX(CONSTANT_Fieldref)),
|
BAND_INIT(bc_fieldref, DELTA5_spec, INDEX(CONSTANT_Fieldref)),
|
||||||
BAND_INIT(bc_methodref, UNSIGNED5_spec, INDEX(CONSTANT_Methodref)),
|
BAND_INIT(bc_methodref, UNSIGNED5_spec, INDEX(CONSTANT_Methodref)),
|
||||||
BAND_INIT(bc_imethodref, DELTA5_spec, INDEX(CONSTANT_InterfaceMethodref)),
|
BAND_INIT(bc_imethodref, DELTA5_spec, INDEX(CONSTANT_InterfaceMethodref)),
|
||||||
|
BAND_INIT(bc_indyref, DELTA5_spec, INDEX(CONSTANT_InvokeDynamic)),
|
||||||
BAND_INIT(bc_thisfield, UNSIGNED5_spec, SUB_INDEX(CONSTANT_Fieldref)),
|
BAND_INIT(bc_thisfield, UNSIGNED5_spec, SUB_INDEX(CONSTANT_Fieldref)),
|
||||||
BAND_INIT(bc_superfield, UNSIGNED5_spec, SUB_INDEX(CONSTANT_Fieldref)),
|
BAND_INIT(bc_superfield, UNSIGNED5_spec, SUB_INDEX(CONSTANT_Fieldref)),
|
||||||
BAND_INIT(bc_thismethod, UNSIGNED5_spec, SUB_INDEX(CONSTANT_Methodref)),
|
BAND_INIT(bc_thismethod, UNSIGNED5_spec, SUB_INDEX(CONSTANT_Methodref)),
|
||||||
@ -471,7 +478,7 @@ void band::initIndexes(unpacker* u) {
|
|||||||
for (int i = 0; i < BAND_LIMIT; i++) {
|
for (int i = 0; i < BAND_LIMIT; i++) {
|
||||||
band* scan = &tmp_all_bands[i];
|
band* scan = &tmp_all_bands[i];
|
||||||
uint tag = scan->ixTag; // Cf. #define INDEX(tag) above
|
uint tag = scan->ixTag; // Cf. #define INDEX(tag) above
|
||||||
if (tag != 0 && tag != CONSTANT_Literal && (tag & SUBINDEX_BIT) == 0) {
|
if (tag != 0 && tag != CONSTANT_FieldSpecific && (tag & SUBINDEX_BIT) == 0) {
|
||||||
scan->setIndex(u->cp.getIndex(tag));
|
scan->setIndex(u->cp.getIndex(tag));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (c) 2002, 2005, Oracle and/or its affiliates. All rights reserved.
|
* Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved.
|
||||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||||
*
|
*
|
||||||
* This code is free software; you can redistribute it and/or modify it
|
* This code is free software; you can redistribute it and/or modify it
|
||||||
@ -29,9 +29,7 @@ struct cpindex;
|
|||||||
struct unpacker;
|
struct unpacker;
|
||||||
|
|
||||||
struct band {
|
struct band {
|
||||||
#ifndef PRODUCT
|
|
||||||
const char* name;
|
const char* name;
|
||||||
#endif
|
|
||||||
int bn; // band_number of this band
|
int bn; // band_number of this band
|
||||||
coding* defc; // default coding method
|
coding* defc; // default coding method
|
||||||
cpindex* ix; // CP entry mapping, if CPRefBand
|
cpindex* ix; // CP entry mapping, if CPRefBand
|
||||||
@ -162,6 +160,14 @@ enum band_number {
|
|||||||
e_cp_Method_desc,
|
e_cp_Method_desc,
|
||||||
e_cp_Imethod_class,
|
e_cp_Imethod_class,
|
||||||
e_cp_Imethod_desc,
|
e_cp_Imethod_desc,
|
||||||
|
e_cp_MethodHandle_refkind,
|
||||||
|
e_cp_MethodHandle_member,
|
||||||
|
e_cp_MethodType,
|
||||||
|
e_cp_BootstrapMethod_ref,
|
||||||
|
e_cp_BootstrapMethod_arg_count,
|
||||||
|
e_cp_BootstrapMethod_arg,
|
||||||
|
e_cp_InvokeDynamic_spec,
|
||||||
|
e_cp_InvokeDynamic_desc,
|
||||||
|
|
||||||
// bands which define transmission of attributes
|
// bands which define transmission of attributes
|
||||||
e_attr_definition_headers,
|
e_attr_definition_headers,
|
||||||
@ -284,11 +290,13 @@ enum band_number {
|
|||||||
e_bc_longref,
|
e_bc_longref,
|
||||||
e_bc_doubleref,
|
e_bc_doubleref,
|
||||||
e_bc_stringref,
|
e_bc_stringref,
|
||||||
|
e_bc_loadablevalueref,
|
||||||
e_bc_classref,
|
e_bc_classref,
|
||||||
|
|
||||||
e_bc_fieldref,
|
e_bc_fieldref,
|
||||||
e_bc_methodref,
|
e_bc_methodref,
|
||||||
e_bc_imethodref,
|
e_bc_imethodref,
|
||||||
|
e_bc_indyref,
|
||||||
|
|
||||||
// _self_linker_op family
|
// _self_linker_op family
|
||||||
e_bc_thisfield,
|
e_bc_thisfield,
|
||||||
@ -343,6 +351,14 @@ enum band_number {
|
|||||||
#define cp_Method_desc all_bands[e_cp_Method_desc]
|
#define cp_Method_desc all_bands[e_cp_Method_desc]
|
||||||
#define cp_Imethod_class all_bands[e_cp_Imethod_class]
|
#define cp_Imethod_class all_bands[e_cp_Imethod_class]
|
||||||
#define cp_Imethod_desc all_bands[e_cp_Imethod_desc]
|
#define cp_Imethod_desc all_bands[e_cp_Imethod_desc]
|
||||||
|
#define cp_MethodHandle_refkind all_bands[e_cp_MethodHandle_refkind]
|
||||||
|
#define cp_MethodHandle_member all_bands[e_cp_MethodHandle_member]
|
||||||
|
#define cp_MethodType all_bands[e_cp_MethodType]
|
||||||
|
#define cp_BootstrapMethod_ref all_bands[e_cp_BootstrapMethod_ref]
|
||||||
|
#define cp_BootstrapMethod_arg_count all_bands[e_cp_BootstrapMethod_arg_count]
|
||||||
|
#define cp_BootstrapMethod_arg all_bands[e_cp_BootstrapMethod_arg]
|
||||||
|
#define cp_InvokeDynamic_spec all_bands[e_cp_InvokeDynamic_spec]
|
||||||
|
#define cp_InvokeDynamic_desc all_bands[e_cp_InvokeDynamic_desc]
|
||||||
#define attr_definition_headers all_bands[e_attr_definition_headers]
|
#define attr_definition_headers all_bands[e_attr_definition_headers]
|
||||||
#define attr_definition_name all_bands[e_attr_definition_name]
|
#define attr_definition_name all_bands[e_attr_definition_name]
|
||||||
#define attr_definition_layout all_bands[e_attr_definition_layout]
|
#define attr_definition_layout all_bands[e_attr_definition_layout]
|
||||||
@ -437,10 +453,12 @@ enum band_number {
|
|||||||
#define bc_longref all_bands[e_bc_longref]
|
#define bc_longref all_bands[e_bc_longref]
|
||||||
#define bc_doubleref all_bands[e_bc_doubleref]
|
#define bc_doubleref all_bands[e_bc_doubleref]
|
||||||
#define bc_stringref all_bands[e_bc_stringref]
|
#define bc_stringref all_bands[e_bc_stringref]
|
||||||
|
#define bc_loadablevalueref all_bands[e_bc_loadablevalueref]
|
||||||
#define bc_classref all_bands[e_bc_classref]
|
#define bc_classref all_bands[e_bc_classref]
|
||||||
#define bc_fieldref all_bands[e_bc_fieldref]
|
#define bc_fieldref all_bands[e_bc_fieldref]
|
||||||
#define bc_methodref all_bands[e_bc_methodref]
|
#define bc_methodref all_bands[e_bc_methodref]
|
||||||
#define bc_imethodref all_bands[e_bc_imethodref]
|
#define bc_imethodref all_bands[e_bc_imethodref]
|
||||||
|
#define bc_indyref all_bands[e_bc_indyref]
|
||||||
#define bc_thisfield all_bands[e_bc_thisfield]
|
#define bc_thisfield all_bands[e_bc_thisfield]
|
||||||
#define bc_superfield all_bands[e_bc_superfield]
|
#define bc_superfield all_bands[e_bc_superfield]
|
||||||
#define bc_thismethod all_bands[e_bc_thismethod]
|
#define bc_thismethod all_bands[e_bc_thismethod]
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (c) 2001, 2005, Oracle and/or its affiliates. All rights reserved.
|
* Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
|
||||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||||
*
|
*
|
||||||
* This code is free software; you can redistribute it and/or modify it
|
* This code is free software; you can redistribute it and/or modify it
|
||||||
@ -49,33 +49,53 @@
|
|||||||
#define JAVA6_PACKAGE_MAJOR_VERSION 160
|
#define JAVA6_PACKAGE_MAJOR_VERSION 160
|
||||||
#define JAVA6_PACKAGE_MINOR_VERSION 1
|
#define JAVA6_PACKAGE_MINOR_VERSION 1
|
||||||
|
|
||||||
|
#define JAVA7_PACKAGE_MAJOR_VERSION 170
|
||||||
|
#define JAVA7_PACKAGE_MINOR_VERSION 1
|
||||||
|
|
||||||
// magic number for gzip streams (for processing pack200-gzip data)
|
// magic number for gzip streams (for processing pack200-gzip data)
|
||||||
#define GZIP_MAGIC 0x1F8B0800
|
#define GZIP_MAGIC 0x1F8B0800
|
||||||
#define GZIP_MAGIC_MASK 0xFFFFFF00 // last byte is variable "flg" field
|
#define GZIP_MAGIC_MASK 0xFFFFFF00 // last byte is variable "flg" field
|
||||||
|
|
||||||
enum {
|
enum {
|
||||||
CONSTANT_None,
|
CONSTANT_None = 0,
|
||||||
CONSTANT_Utf8,
|
CONSTANT_Utf8 = 1,
|
||||||
CONSTANT_unused2, /* unused, was Unicode */
|
CONSTANT_unused = 2, /* unused, was Unicode */
|
||||||
CONSTANT_Integer,
|
CONSTANT_Integer = 3,
|
||||||
CONSTANT_Float,
|
CONSTANT_Float = 4,
|
||||||
CONSTANT_Long,
|
CONSTANT_Long = 5,
|
||||||
CONSTANT_Double,
|
CONSTANT_Double = 6,
|
||||||
CONSTANT_Class,
|
CONSTANT_Class = 7,
|
||||||
CONSTANT_String,
|
CONSTANT_String = 8,
|
||||||
CONSTANT_Fieldref,
|
CONSTANT_Fieldref = 9,
|
||||||
CONSTANT_Methodref,
|
CONSTANT_Methodref = 10,
|
||||||
CONSTANT_InterfaceMethodref,
|
CONSTANT_InterfaceMethodref = 11,
|
||||||
CONSTANT_NameandType,
|
CONSTANT_NameandType = 12,
|
||||||
|
CONSTANT_unused13 = 13,
|
||||||
|
CONSTANT_unused14 = 14,
|
||||||
|
CONSTANT_MethodHandle = 15,
|
||||||
|
CONSTANT_MethodType = 16,
|
||||||
|
CONSTANT_unused17 = 17,
|
||||||
|
CONSTANT_InvokeDynamic = 18,
|
||||||
|
CONSTANT_Limit = 19,
|
||||||
|
CONSTANT_Signature = CONSTANT_unused13,
|
||||||
|
CONSTANT_BootstrapMethod = CONSTANT_unused17, // used only for InvokeDynamic
|
||||||
|
CONSTANT_All = 50, // combined global map
|
||||||
|
CONSTANT_LoadableValue = 51, // used for 'KL' and qldc operands
|
||||||
|
CONSTANT_AnyMember = 52, // union of refs to field or (interface) method
|
||||||
|
CONSTANT_FieldSpecific = 53, // used only for 'KQ' ConstantValue attrs
|
||||||
|
CONSTANT_GroupFirst = CONSTANT_All, // start group marker
|
||||||
|
CONSTANT_GroupLimit = 54, // end group marker
|
||||||
|
|
||||||
CONSTANT_Signature = 13,
|
// CONSTANT_MethodHandle reference kinds
|
||||||
CONSTANT_All = 14,
|
REF_getField = 1,
|
||||||
CONSTANT_Limit = 15,
|
REF_getStatic = 2,
|
||||||
CONSTANT_NONE = 0,
|
REF_putField = 3,
|
||||||
|
REF_putStatic = 4,
|
||||||
CONSTANT_Literal = 20, //pseudo-tag for debugging
|
REF_invokeVirtual = 5,
|
||||||
CONSTANT_Member = 21, //pseudo-tag for debugging
|
REF_invokeStatic = 6,
|
||||||
|
REF_invokeSpecial = 7,
|
||||||
|
REF_newInvokeSpecial = 8,
|
||||||
|
REF_invokeInterface = 9,
|
||||||
|
|
||||||
SUBINDEX_BIT = 64, // combined with CONSTANT_xxx for ixTag
|
SUBINDEX_BIT = 64, // combined with CONSTANT_xxx for ixTag
|
||||||
|
|
||||||
@ -86,6 +106,7 @@ enum {
|
|||||||
CLASS_ATTR_EnclosingMethod = 18,
|
CLASS_ATTR_EnclosingMethod = 18,
|
||||||
CLASS_ATTR_InnerClasses = 23,
|
CLASS_ATTR_InnerClasses = 23,
|
||||||
CLASS_ATTR_ClassFile_version = 24,
|
CLASS_ATTR_ClassFile_version = 24,
|
||||||
|
CLASS_ATTR_BootstrapMethods = 25,
|
||||||
FIELD_ATTR_ConstantValue = 17,
|
FIELD_ATTR_ConstantValue = 17,
|
||||||
METHOD_ATTR_Code = 17,
|
METHOD_ATTR_Code = 17,
|
||||||
METHOD_ATTR_Exceptions = 18,
|
METHOD_ATTR_Exceptions = 18,
|
||||||
@ -121,6 +142,7 @@ enum {
|
|||||||
F(CLASS_ATTR_InnerClasses,InnerClasses) \
|
F(CLASS_ATTR_InnerClasses,InnerClasses) \
|
||||||
F(CLASS_ATTR_EnclosingMethod,EnclosingMethod) \
|
F(CLASS_ATTR_EnclosingMethod,EnclosingMethod) \
|
||||||
F(CLASS_ATTR_ClassFile_version,02) \
|
F(CLASS_ATTR_ClassFile_version,02) \
|
||||||
|
F(CLASS_ATTR_BootstrapMethods,BootstrapMethods) \
|
||||||
/*(end)*/
|
/*(end)*/
|
||||||
#define FIELD_ATTR_DO(F) \
|
#define FIELD_ATTR_DO(F) \
|
||||||
F(FIELD_ATTR_ConstantValue,ConstantValue) \
|
F(FIELD_ATTR_ConstantValue,ConstantValue) \
|
||||||
@ -175,7 +197,7 @@ enum {
|
|||||||
AO_HAVE_SPECIAL_FORMATS = 1<<0,
|
AO_HAVE_SPECIAL_FORMATS = 1<<0,
|
||||||
AO_HAVE_CP_NUMBERS = 1<<1,
|
AO_HAVE_CP_NUMBERS = 1<<1,
|
||||||
AO_HAVE_ALL_CODE_FLAGS = 1<<2,
|
AO_HAVE_ALL_CODE_FLAGS = 1<<2,
|
||||||
AO_3_UNUSED_MBZ = 1<<3,
|
AO_HAVE_CP_EXTRAS = 1<<3,
|
||||||
AO_HAVE_FILE_HEADERS = 1<<4,
|
AO_HAVE_FILE_HEADERS = 1<<4,
|
||||||
AO_DEFLATE_HINT = 1<<5,
|
AO_DEFLATE_HINT = 1<<5,
|
||||||
AO_HAVE_FILE_MODTIME = 1<<6,
|
AO_HAVE_FILE_MODTIME = 1<<6,
|
||||||
@ -185,11 +207,13 @@ enum {
|
|||||||
AO_HAVE_FIELD_FLAGS_HI = 1<<10,
|
AO_HAVE_FIELD_FLAGS_HI = 1<<10,
|
||||||
AO_HAVE_METHOD_FLAGS_HI = 1<<11,
|
AO_HAVE_METHOD_FLAGS_HI = 1<<11,
|
||||||
AO_HAVE_CODE_FLAGS_HI = 1<<12,
|
AO_HAVE_CODE_FLAGS_HI = 1<<12,
|
||||||
|
AO_UNUSED_MBZ = (-1)<<13, // options bits reserved for future use.
|
||||||
|
|
||||||
#define ARCHIVE_BIT_DO(F) \
|
#define ARCHIVE_BIT_DO(F) \
|
||||||
F(AO_HAVE_SPECIAL_FORMATS) \
|
F(AO_HAVE_SPECIAL_FORMATS) \
|
||||||
F(AO_HAVE_CP_NUMBERS) \
|
F(AO_HAVE_CP_NUMBERS) \
|
||||||
F(AO_HAVE_ALL_CODE_FLAGS) \
|
F(AO_HAVE_ALL_CODE_FLAGS) \
|
||||||
/*F(AO_3_UNUSED_MBZ)*/ \
|
F(AO_HAVE_CP_EXTRAS) \
|
||||||
F(AO_HAVE_FILE_HEADERS) \
|
F(AO_HAVE_FILE_HEADERS) \
|
||||||
F(AO_DEFLATE_HINT) \
|
F(AO_DEFLATE_HINT) \
|
||||||
F(AO_HAVE_FILE_MODTIME) \
|
F(AO_HAVE_FILE_MODTIME) \
|
||||||
@ -416,7 +440,7 @@ enum {
|
|||||||
bc_invokespecial = 183, // 0xb7
|
bc_invokespecial = 183, // 0xb7
|
||||||
bc_invokestatic = 184, // 0xb8
|
bc_invokestatic = 184, // 0xb8
|
||||||
bc_invokeinterface = 185, // 0xb9
|
bc_invokeinterface = 185, // 0xb9
|
||||||
bc_xxxunusedxxx = 186, // 0xba
|
bc_invokedynamic = 186, // 0xba
|
||||||
bc_new = 187, // 0xbb
|
bc_new = 187, // 0xbb
|
||||||
bc_newarray = 188, // 0xbc
|
bc_newarray = 188, // 0xbc
|
||||||
bc_anewarray = 189, // 0xbd
|
bc_anewarray = 189, // 0xbd
|
||||||
@ -455,17 +479,19 @@ enum {
|
|||||||
_invokeinit_limit = _invokeinit_op+3,
|
_invokeinit_limit = _invokeinit_op+3,
|
||||||
|
|
||||||
_xldc_op = _invokeinit_limit,
|
_xldc_op = _invokeinit_limit,
|
||||||
bc_aldc = bc_ldc,
|
bc_sldc = bc_ldc, // previously named bc_aldc
|
||||||
bc_cldc = _xldc_op+0,
|
bc_cldc = _xldc_op+0,
|
||||||
bc_ildc = _xldc_op+1,
|
bc_ildc = _xldc_op+1,
|
||||||
bc_fldc = _xldc_op+2,
|
bc_fldc = _xldc_op+2,
|
||||||
bc_aldc_w = bc_ldc_w,
|
bc_sldc_w = bc_ldc_w, // previously named bc_aldc_w
|
||||||
bc_cldc_w = _xldc_op+3,
|
bc_cldc_w = _xldc_op+3,
|
||||||
bc_ildc_w = _xldc_op+4,
|
bc_ildc_w = _xldc_op+4,
|
||||||
bc_fldc_w = _xldc_op+5,
|
bc_fldc_w = _xldc_op+5,
|
||||||
bc_lldc2_w = bc_ldc2_w,
|
bc_lldc2_w = bc_ldc2_w,
|
||||||
bc_dldc2_w = _xldc_op+6,
|
bc_dldc2_w = _xldc_op+6,
|
||||||
_xldc_limit = _xldc_op+7,
|
// anything other primitive, string, or class must be handled with qldc:
|
||||||
|
bc_qldc = _xldc_op+7,
|
||||||
|
bc_qldc_w = _xldc_op+8,
|
||||||
|
_xldc_limit = _xldc_op+9,
|
||||||
_xxx_3_end
|
_xxx_3_end
|
||||||
};
|
};
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (c) 2001, 2009, Oracle and/or its affiliates. All rights reserved.
|
* Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
|
||||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||||
*
|
*
|
||||||
* This code is free software; you can redistribute it and/or modify it
|
* This code is free software; you can redistribute it and/or modify it
|
||||||
@ -110,6 +110,7 @@ typedef DWORDLONG julong;
|
|||||||
#define strcasecmp(s1, s2) _stricmp(s1,s2)
|
#define strcasecmp(s1, s2) _stricmp(s1,s2)
|
||||||
#define tempname _tempname
|
#define tempname _tempname
|
||||||
#define sleep Sleep
|
#define sleep Sleep
|
||||||
|
#define snprintf _snprintf
|
||||||
#else
|
#else
|
||||||
typedef signed char byte;
|
typedef signed char byte;
|
||||||
#ifdef _LP64
|
#ifdef _LP64
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
|
* Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
|
||||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||||
*
|
*
|
||||||
* This code is free software; you can redistribute it and/or modify it
|
* This code is free software; you can redistribute it and/or modify it
|
||||||
@ -81,7 +81,12 @@ static const byte TAGS_IN_ORDER[] = {
|
|||||||
CONSTANT_NameandType,
|
CONSTANT_NameandType,
|
||||||
CONSTANT_Fieldref,
|
CONSTANT_Fieldref,
|
||||||
CONSTANT_Methodref,
|
CONSTANT_Methodref,
|
||||||
CONSTANT_InterfaceMethodref
|
CONSTANT_InterfaceMethodref,
|
||||||
|
// constants defined as of JDK 7
|
||||||
|
CONSTANT_MethodHandle,
|
||||||
|
CONSTANT_MethodType,
|
||||||
|
CONSTANT_BootstrapMethod,
|
||||||
|
CONSTANT_InvokeDynamic
|
||||||
};
|
};
|
||||||
#define N_TAGS_IN_ORDER (sizeof TAGS_IN_ORDER)
|
#define N_TAGS_IN_ORDER (sizeof TAGS_IN_ORDER)
|
||||||
|
|
||||||
@ -101,6 +106,11 @@ static const char* TAG_NAME[] = {
|
|||||||
"InterfaceMethodref",
|
"InterfaceMethodref",
|
||||||
"NameandType",
|
"NameandType",
|
||||||
"*Signature",
|
"*Signature",
|
||||||
|
"unused14",
|
||||||
|
"MethodHandle",
|
||||||
|
"MethodType",
|
||||||
|
"*BootstrapMethod",
|
||||||
|
"InvokeDynamic",
|
||||||
0
|
0
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -114,9 +124,13 @@ static const char* ATTR_CONTEXT_NAME[] = { // match ATTR_CONTEXT_NAME, etc.
|
|||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
// Note that REQUESTED_LDC comes first, then the normal REQUESTED,
|
||||||
// REQUESTED must be -2 for u2 and REQUESTED_LDC must be -1 for u1
|
// in the regular constant pool.
|
||||||
enum { NOT_REQUESTED = 0, REQUESTED = -2, REQUESTED_LDC = -1 };
|
enum { REQUESTED_NONE = -1,
|
||||||
|
// The codes below REQUESTED_NONE are in constant pool output order,
|
||||||
|
// for the sake of outputEntry_cmp:
|
||||||
|
REQUESTED_LDC = -99, REQUESTED
|
||||||
|
};
|
||||||
|
|
||||||
#define NO_INORD ((uint)-1)
|
#define NO_INORD ((uint)-1)
|
||||||
|
|
||||||
@ -146,7 +160,7 @@ struct entry {
|
|||||||
|
|
||||||
void requestOutputIndex(cpool& cp, int req = REQUESTED);
|
void requestOutputIndex(cpool& cp, int req = REQUESTED);
|
||||||
int getOutputIndex() {
|
int getOutputIndex() {
|
||||||
assert(outputIndex > NOT_REQUESTED);
|
assert(outputIndex > REQUESTED_NONE);
|
||||||
return outputIndex;
|
return outputIndex;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -167,12 +181,12 @@ struct entry {
|
|||||||
}
|
}
|
||||||
|
|
||||||
entry* memberClass() {
|
entry* memberClass() {
|
||||||
assert(tagMatches(CONSTANT_Member));
|
assert(tagMatches(CONSTANT_AnyMember));
|
||||||
return ref(0);
|
return ref(0);
|
||||||
}
|
}
|
||||||
|
|
||||||
entry* memberDescr() {
|
entry* memberDescr() {
|
||||||
assert(tagMatches(CONSTANT_Member));
|
assert(tagMatches(CONSTANT_AnyMember));
|
||||||
return ref(1);
|
return ref(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -199,9 +213,9 @@ struct entry {
|
|||||||
return (tag2 == tag)
|
return (tag2 == tag)
|
||||||
|| (tag2 == CONSTANT_Utf8 && tag == CONSTANT_Signature)
|
|| (tag2 == CONSTANT_Utf8 && tag == CONSTANT_Signature)
|
||||||
#ifndef PRODUCT
|
#ifndef PRODUCT
|
||||||
|| (tag2 == CONSTANT_Literal
|
|| (tag2 == CONSTANT_FieldSpecific
|
||||||
&& tag >= CONSTANT_Integer && tag <= CONSTANT_String && tag != CONSTANT_Class)
|
&& tag >= CONSTANT_Integer && tag <= CONSTANT_String && tag != CONSTANT_Class)
|
||||||
|| (tag2 == CONSTANT_Member
|
|| (tag2 == CONSTANT_AnyMember
|
||||||
&& tag >= CONSTANT_Fieldref && tag <= CONSTANT_InterfaceMethodref)
|
&& tag >= CONSTANT_Fieldref && tag <= CONSTANT_InterfaceMethodref)
|
||||||
#endif
|
#endif
|
||||||
;
|
;
|
||||||
@ -309,6 +323,7 @@ void unpacker::free() {
|
|||||||
code_fixup_offset.free();
|
code_fixup_offset.free();
|
||||||
code_fixup_source.free();
|
code_fixup_source.free();
|
||||||
requested_ics.free();
|
requested_ics.free();
|
||||||
|
cp.requested_bsms.free();
|
||||||
cur_classfile_head.free();
|
cur_classfile_head.free();
|
||||||
cur_classfile_tail.free();
|
cur_classfile_tail.free();
|
||||||
for (i = 0; i < ATTR_CONTEXT_LIMIT; i++)
|
for (i = 0; i < ATTR_CONTEXT_LIMIT; i++)
|
||||||
@ -448,12 +463,12 @@ maybe_inline
|
|||||||
int unpacker::putref_index(entry* e, int size) {
|
int unpacker::putref_index(entry* e, int size) {
|
||||||
if (e == null)
|
if (e == null)
|
||||||
return 0;
|
return 0;
|
||||||
else if (e->outputIndex > NOT_REQUESTED)
|
else if (e->outputIndex > REQUESTED_NONE)
|
||||||
return e->outputIndex;
|
return e->outputIndex;
|
||||||
else if (e->tag == CONSTANT_Signature)
|
else if (e->tag == CONSTANT_Signature)
|
||||||
return putref_index(e->ref(0), size);
|
return putref_index(e->ref(0), size);
|
||||||
else {
|
else {
|
||||||
e->requestOutputIndex(cp, -size);
|
e->requestOutputIndex(cp, (size == 1 ? REQUESTED_LDC : REQUESTED));
|
||||||
// Later on we'll fix the bits.
|
// Later on we'll fix the bits.
|
||||||
class_fixup_type.addByte(size);
|
class_fixup_type.addByte(size);
|
||||||
class_fixup_offset.add((int)wpoffset());
|
class_fixup_offset.add((int)wpoffset());
|
||||||
@ -515,28 +530,33 @@ void unpacker::saveTo(bytes& b, byte* ptr, size_t len) {
|
|||||||
b.copyFrom(ptr, len);
|
b.copyFrom(ptr, len);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool testBit(int archive_options, int bitMask) {
|
||||||
|
return (archive_options & bitMask) != 0;
|
||||||
|
}
|
||||||
|
|
||||||
// Read up through band_headers.
|
// Read up through band_headers.
|
||||||
// Do the archive_size dance to set the size of the input mega-buffer.
|
// Do the archive_size dance to set the size of the input mega-buffer.
|
||||||
void unpacker::read_file_header() {
|
void unpacker::read_file_header() {
|
||||||
// Read file header to determine file type and total size.
|
// Read file header to determine file type and total size.
|
||||||
enum {
|
enum {
|
||||||
MAGIC_BYTES = 4,
|
MAGIC_BYTES = 4,
|
||||||
AH_LENGTH_0 = 3, //minver, majver, options are outside of archive_size
|
AH_LENGTH_0 = 3, // archive_header_0 = {minver, majver, options}
|
||||||
|
AH_LENGTH_MIN = 15, // observed in spec {header_0[3], cp_counts[8], class_counts[4]}
|
||||||
AH_LENGTH_0_MAX = AH_LENGTH_0 + 1, // options might have 2 bytes
|
AH_LENGTH_0_MAX = AH_LENGTH_0 + 1, // options might have 2 bytes
|
||||||
AH_LENGTH = 26, //maximum archive header length (w/ all fields)
|
AH_LENGTH = 30, //maximum archive header length (w/ all fields)
|
||||||
// Length contributions from optional header fields:
|
// Length contributions from optional header fields:
|
||||||
AH_FILE_HEADER_LEN = 5, // sizehi/lo/next/modtime/files
|
AH_LENGTH_S = 2, // archive_header_S = optional {size_hi, size_lo}
|
||||||
AH_ARCHIVE_SIZE_LEN = 2, // sizehi/lo only; part of AH_FILE_HEADER_LEN
|
AH_ARCHIVE_SIZE_HI = 0, // offset in archive_header_S
|
||||||
AH_CP_NUMBER_LEN = 4, // int/float/long/double
|
AH_ARCHIVE_SIZE_LO = 1, // offset in archive_header_S
|
||||||
AH_SPECIAL_FORMAT_LEN = 2, // layouts/band-headers
|
AH_FILE_HEADER_LEN = 5, // file_counts = {{size_hi, size_lo), next, modtile, files}
|
||||||
AH_LENGTH_MIN = AH_LENGTH
|
AH_SPECIAL_FORMAT_LEN = 2, // special_count = {layouts, band_headers}
|
||||||
-(AH_FILE_HEADER_LEN+AH_SPECIAL_FORMAT_LEN+AH_CP_NUMBER_LEN),
|
AH_CP_NUMBER_LEN = 4, // cp_number_counts = {int, float, long, double}
|
||||||
ARCHIVE_SIZE_MIN = AH_LENGTH_MIN - (AH_LENGTH_0 + AH_ARCHIVE_SIZE_LEN),
|
AH_CP_EXTRA_LEN = 4, // cp_attr_counts = {MH, MT, InDy, BSM}
|
||||||
|
ARCHIVE_SIZE_MIN = AH_LENGTH_MIN - AH_LENGTH_0 - AH_LENGTH_S,
|
||||||
FIRST_READ = MAGIC_BYTES + AH_LENGTH_MIN
|
FIRST_READ = MAGIC_BYTES + AH_LENGTH_MIN
|
||||||
};
|
};
|
||||||
|
|
||||||
assert(AH_LENGTH_MIN == 15); // # of UNSIGNED5 fields required after archive_magic
|
assert(AH_LENGTH_MIN == 15); // # of UNSIGNED5 fields required after archive_magic
|
||||||
assert(ARCHIVE_SIZE_MIN == 10); // # of UNSIGNED5 fields required after archive_size
|
|
||||||
// An absolute minimum null archive is magic[4], {minver,majver,options}[3],
|
// An absolute minimum null archive is magic[4], {minver,majver,options}[3],
|
||||||
// archive_size[0], cp_counts[8], class_counts[4], for a total of 19 bytes.
|
// archive_size[0], cp_counts[8], class_counts[4], for a total of 19 bytes.
|
||||||
// (Note that archive_size is optional; it may be 0..10 bytes in length.)
|
// (Note that archive_size is optional; it may be 0..10 bytes in length.)
|
||||||
@ -622,23 +642,32 @@ void unpacker::read_file_header() {
|
|||||||
// Read the first 3 values from the header.
|
// Read the first 3 values from the header.
|
||||||
value_stream hdr;
|
value_stream hdr;
|
||||||
int hdrVals = 0;
|
int hdrVals = 0;
|
||||||
int hdrValsSkipped = 0; // debug only
|
int hdrValsSkipped = 0; // for assert
|
||||||
hdr.init(rp, rplimit, UNSIGNED5_spec);
|
hdr.init(rp, rplimit, UNSIGNED5_spec);
|
||||||
minver = hdr.getInt();
|
minver = hdr.getInt();
|
||||||
majver = hdr.getInt();
|
majver = hdr.getInt();
|
||||||
hdrVals += 2;
|
hdrVals += 2;
|
||||||
|
|
||||||
if (magic != (int)JAVA_PACKAGE_MAGIC ||
|
int majmin[3][2] = {
|
||||||
(majver != JAVA5_PACKAGE_MAJOR_VERSION &&
|
{JAVA5_PACKAGE_MAJOR_VERSION, JAVA5_PACKAGE_MINOR_VERSION},
|
||||||
majver != JAVA6_PACKAGE_MAJOR_VERSION) ||
|
{JAVA6_PACKAGE_MAJOR_VERSION, JAVA6_PACKAGE_MINOR_VERSION},
|
||||||
(minver != JAVA5_PACKAGE_MINOR_VERSION &&
|
{JAVA7_PACKAGE_MAJOR_VERSION, JAVA7_PACKAGE_MINOR_VERSION}
|
||||||
minver != JAVA6_PACKAGE_MINOR_VERSION)) {
|
};
|
||||||
|
int majminfound = false;
|
||||||
|
for (int i = 0 ; i < 3 ; i++) {
|
||||||
|
if (majver == majmin[i][0] && minver == majmin[i][1]) {
|
||||||
|
majminfound = true;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (majminfound == null) {
|
||||||
char message[200];
|
char message[200];
|
||||||
sprintf(message, "@" ERROR_FORMAT ": magic/ver = "
|
sprintf(message, "@" ERROR_FORMAT ": magic/ver = "
|
||||||
"%08X/%d.%d should be %08X/%d.%d OR %08X/%d.%d\n",
|
"%08X/%d.%d should be %08X/%d.%d OR %08X/%d.%d OR %08X/%d.%d\n",
|
||||||
magic, majver, minver,
|
magic, majver, minver,
|
||||||
JAVA_PACKAGE_MAGIC, JAVA5_PACKAGE_MAJOR_VERSION, JAVA5_PACKAGE_MINOR_VERSION,
|
JAVA_PACKAGE_MAGIC, JAVA5_PACKAGE_MAJOR_VERSION, JAVA5_PACKAGE_MINOR_VERSION,
|
||||||
JAVA_PACKAGE_MAGIC, JAVA6_PACKAGE_MAJOR_VERSION, JAVA6_PACKAGE_MINOR_VERSION);
|
JAVA_PACKAGE_MAGIC, JAVA6_PACKAGE_MAJOR_VERSION, JAVA6_PACKAGE_MINOR_VERSION,
|
||||||
|
JAVA_PACKAGE_MAGIC, JAVA7_PACKAGE_MAJOR_VERSION, JAVA7_PACKAGE_MINOR_VERSION);
|
||||||
abort(message);
|
abort(message);
|
||||||
}
|
}
|
||||||
CHECK;
|
CHECK;
|
||||||
@ -646,18 +675,26 @@ void unpacker::read_file_header() {
|
|||||||
archive_options = hdr.getInt();
|
archive_options = hdr.getInt();
|
||||||
hdrVals += 1;
|
hdrVals += 1;
|
||||||
assert(hdrVals == AH_LENGTH_0); // first three fields only
|
assert(hdrVals == AH_LENGTH_0); // first three fields only
|
||||||
|
bool haveSizeHi = testBit(archive_options, AO_HAVE_FILE_SIZE_HI);
|
||||||
|
bool haveModTime = testBit(archive_options, AO_HAVE_FILE_MODTIME);
|
||||||
|
bool haveFileOpt = testBit(archive_options, AO_HAVE_FILE_OPTIONS);
|
||||||
|
|
||||||
#define ORBIT(bit) |(bit)
|
bool haveSpecial = testBit(archive_options, AO_HAVE_SPECIAL_FORMATS);
|
||||||
int OPTION_LIMIT = (0 ARCHIVE_BIT_DO(ORBIT));
|
bool haveFiles = testBit(archive_options, AO_HAVE_FILE_HEADERS);
|
||||||
#undef ORBIT
|
bool haveNumbers = testBit(archive_options, AO_HAVE_CP_NUMBERS);
|
||||||
if ((archive_options & ~OPTION_LIMIT) != 0) {
|
bool haveCPExtra = testBit(archive_options, AO_HAVE_CP_EXTRAS);
|
||||||
fprintf(errstrm, "Warning: Illegal archive options 0x%x\n",
|
|
||||||
archive_options);
|
if (majver < JAVA7_PACKAGE_MAJOR_VERSION) {
|
||||||
abort("illegal archive options");
|
if (haveCPExtra) {
|
||||||
|
abort("Format bits for Java 7 must be zero in previous releases");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
if ((archive_options & AO_HAVE_FILE_HEADERS) != 0) {
|
if (testBit(archive_options, AO_UNUSED_MBZ)) {
|
||||||
|
abort("High archive option bits are reserved and must be zero");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (haveFiles) {
|
||||||
uint hi = hdr.getInt();
|
uint hi = hdr.getInt();
|
||||||
uint lo = hdr.getInt();
|
uint lo = hdr.getInt();
|
||||||
julong x = band::makeLong(hi, lo);
|
julong x = band::makeLong(hi, lo);
|
||||||
@ -738,13 +775,23 @@ void unpacker::read_file_header() {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// read the rest of the header fields
|
// read the rest of the header fields int assertSkipped = AH_LENGTH_MIN - AH_LENGTH_0 - AH_LENGTH_S;
|
||||||
ensure_input((AH_LENGTH-AH_LENGTH_0) * B_MAX);
|
int remainingHeaders = AH_LENGTH_MIN - AH_LENGTH_0 - AH_LENGTH_S;
|
||||||
|
if (haveSpecial)
|
||||||
|
remainingHeaders += AH_SPECIAL_FORMAT_LEN;
|
||||||
|
if (haveFiles)
|
||||||
|
remainingHeaders += AH_FILE_HEADER_LEN;
|
||||||
|
if (haveNumbers)
|
||||||
|
remainingHeaders += AH_CP_NUMBER_LEN;
|
||||||
|
if (haveCPExtra)
|
||||||
|
remainingHeaders += AH_CP_EXTRA_LEN;
|
||||||
|
|
||||||
|
ensure_input(remainingHeaders * B_MAX);
|
||||||
CHECK;
|
CHECK;
|
||||||
hdr.rp = rp;
|
hdr.rp = rp;
|
||||||
hdr.rplimit = rplimit;
|
hdr.rplimit = rplimit;
|
||||||
|
|
||||||
if ((archive_options & AO_HAVE_FILE_HEADERS) != 0) {
|
if (haveFiles) {
|
||||||
archive_next_count = hdr.getInt();
|
archive_next_count = hdr.getInt();
|
||||||
CHECK_COUNT(archive_next_count);
|
CHECK_COUNT(archive_next_count);
|
||||||
archive_modtime = hdr.getInt();
|
archive_modtime = hdr.getInt();
|
||||||
@ -755,7 +802,7 @@ void unpacker::read_file_header() {
|
|||||||
hdrValsSkipped += 3;
|
hdrValsSkipped += 3;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ((archive_options & AO_HAVE_SPECIAL_FORMATS) != 0) {
|
if (haveSpecial) {
|
||||||
band_headers_size = hdr.getInt();
|
band_headers_size = hdr.getInt();
|
||||||
CHECK_COUNT(band_headers_size);
|
CHECK_COUNT(band_headers_size);
|
||||||
attr_definition_count = hdr.getInt();
|
attr_definition_count = hdr.getInt();
|
||||||
@ -767,7 +814,7 @@ void unpacker::read_file_header() {
|
|||||||
|
|
||||||
int cp_counts[N_TAGS_IN_ORDER];
|
int cp_counts[N_TAGS_IN_ORDER];
|
||||||
for (int k = 0; k < (int)N_TAGS_IN_ORDER; k++) {
|
for (int k = 0; k < (int)N_TAGS_IN_ORDER; k++) {
|
||||||
if (!(archive_options & AO_HAVE_CP_NUMBERS)) {
|
if (!haveNumbers) {
|
||||||
switch (TAGS_IN_ORDER[k]) {
|
switch (TAGS_IN_ORDER[k]) {
|
||||||
case CONSTANT_Integer:
|
case CONSTANT_Integer:
|
||||||
case CONSTANT_Float:
|
case CONSTANT_Float:
|
||||||
@ -778,6 +825,17 @@ void unpacker::read_file_header() {
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if (!haveCPExtra) {
|
||||||
|
switch(TAGS_IN_ORDER[k]) {
|
||||||
|
case CONSTANT_MethodHandle:
|
||||||
|
case CONSTANT_MethodType:
|
||||||
|
case CONSTANT_InvokeDynamic:
|
||||||
|
case CONSTANT_BootstrapMethod:
|
||||||
|
cp_counts[k] = 0;
|
||||||
|
hdrValsSkipped += 1;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
}
|
||||||
cp_counts[k] = hdr.getInt();
|
cp_counts[k] = hdr.getInt();
|
||||||
CHECK_COUNT(cp_counts[k]);
|
CHECK_COUNT(cp_counts[k]);
|
||||||
hdrVals += 1;
|
hdrVals += 1;
|
||||||
@ -791,36 +849,26 @@ void unpacker::read_file_header() {
|
|||||||
CHECK_COUNT(class_count);
|
CHECK_COUNT(class_count);
|
||||||
hdrVals += 4;
|
hdrVals += 4;
|
||||||
|
|
||||||
// done with archive_header
|
// done with archive_header, time to reconcile to ensure
|
||||||
|
// we have read everything correctly
|
||||||
hdrVals += hdrValsSkipped;
|
hdrVals += hdrValsSkipped;
|
||||||
assert(hdrVals == AH_LENGTH);
|
assert(hdrVals == AH_LENGTH);
|
||||||
#ifndef PRODUCT
|
|
||||||
int assertSkipped = AH_LENGTH - AH_LENGTH_MIN;
|
|
||||||
if ((archive_options & AO_HAVE_FILE_HEADERS) != 0)
|
|
||||||
assertSkipped -= AH_FILE_HEADER_LEN;
|
|
||||||
if ((archive_options & AO_HAVE_SPECIAL_FORMATS) != 0)
|
|
||||||
assertSkipped -= AH_SPECIAL_FORMAT_LEN;
|
|
||||||
if ((archive_options & AO_HAVE_CP_NUMBERS) != 0)
|
|
||||||
assertSkipped -= AH_CP_NUMBER_LEN;
|
|
||||||
assert(hdrValsSkipped == assertSkipped);
|
|
||||||
#endif //PRODUCT
|
|
||||||
|
|
||||||
rp = hdr.rp;
|
rp = hdr.rp;
|
||||||
if (rp > rplimit)
|
if (rp > rplimit)
|
||||||
abort("EOF reading archive header");
|
abort("EOF reading archive header");
|
||||||
|
|
||||||
// Now size the CP.
|
// Now size the CP.
|
||||||
#ifndef PRODUCT
|
#ifndef PRODUCT
|
||||||
bool x = (N_TAGS_IN_ORDER == cpool::NUM_COUNTS);
|
// bool x = (N_TAGS_IN_ORDER == CONSTANT_Limit);
|
||||||
assert(x);
|
// assert(x);
|
||||||
#endif //PRODUCT
|
#endif //PRODUCT
|
||||||
cp.init(this, cp_counts);
|
cp.init(this, cp_counts);
|
||||||
CHECK;
|
CHECK;
|
||||||
|
|
||||||
default_file_modtime = archive_modtime;
|
default_file_modtime = archive_modtime;
|
||||||
if (default_file_modtime == 0 && !(archive_options & AO_HAVE_FILE_MODTIME))
|
if (default_file_modtime == 0 && haveModTime)
|
||||||
default_file_modtime = DEFAULT_ARCHIVE_MODTIME; // taken from driver
|
default_file_modtime = DEFAULT_ARCHIVE_MODTIME; // taken from driver
|
||||||
if ((archive_options & AO_DEFLATE_HINT) != 0)
|
if (testBit(archive_options, AO_DEFLATE_HINT))
|
||||||
default_file_options |= FO_DEFLATE_HINT;
|
default_file_options |= FO_DEFLATE_HINT;
|
||||||
|
|
||||||
// meta-bytes, if any, immediately follow archive header
|
// meta-bytes, if any, immediately follow archive header
|
||||||
@ -876,7 +924,7 @@ void unpacker::finish() {
|
|||||||
|
|
||||||
|
|
||||||
// Cf. PackageReader.readConstantPoolCounts
|
// Cf. PackageReader.readConstantPoolCounts
|
||||||
void cpool::init(unpacker* u_, int counts[NUM_COUNTS]) {
|
void cpool::init(unpacker* u_, int counts[CONSTANT_Limit]) {
|
||||||
this->u = u_;
|
this->u = u_;
|
||||||
|
|
||||||
// Fill-pointer for CP.
|
// Fill-pointer for CP.
|
||||||
@ -924,13 +972,16 @@ void cpool::init(unpacker* u_, int counts[NUM_COUNTS]) {
|
|||||||
first_extra_entry = &entries[nentries];
|
first_extra_entry = &entries[nentries];
|
||||||
|
|
||||||
// Initialize the standard indexes.
|
// Initialize the standard indexes.
|
||||||
tag_count[CONSTANT_All] = nentries;
|
|
||||||
tag_base[ CONSTANT_All] = 0;
|
|
||||||
for (int tag = 0; tag < CONSTANT_Limit; tag++) {
|
for (int tag = 0; tag < CONSTANT_Limit; tag++) {
|
||||||
entry* cpMap = &entries[tag_base[tag]];
|
entry* cpMap = &entries[tag_base[tag]];
|
||||||
tag_index[tag].init(tag_count[tag], cpMap, tag);
|
tag_index[tag].init(tag_count[tag], cpMap, tag);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Initialize *all* our entries once
|
||||||
|
for (int i = 0 ; i < maxentries ; i++)
|
||||||
|
entries[i].outputIndex = REQUESTED_NONE;
|
||||||
|
|
||||||
|
initGroupIndexes();
|
||||||
// Initialize hashTab to a generous power-of-two size.
|
// Initialize hashTab to a generous power-of-two size.
|
||||||
uint pow2 = 1;
|
uint pow2 = 1;
|
||||||
uint target = maxentries + maxentries/2; // 60% full
|
uint target = maxentries + maxentries/2; // 60% full
|
||||||
@ -1281,6 +1332,70 @@ void unpacker::read_signature_values(entry* cpMap, int len) {
|
|||||||
//cp_Signature_classes.done();
|
//cp_Signature_classes.done();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
maybe_inline
|
||||||
|
void unpacker::checkLegacy(const char* name) {
|
||||||
|
if (u->majver < JAVA7_PACKAGE_MAJOR_VERSION) {
|
||||||
|
char message[100];
|
||||||
|
snprintf(message, 99, "unexpected band %s\n", name);
|
||||||
|
abort(message);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
maybe_inline
|
||||||
|
void unpacker::read_method_handle(entry* cpMap, int len) {
|
||||||
|
if (len > 0) {
|
||||||
|
checkLegacy(cp_MethodHandle_refkind.name);
|
||||||
|
}
|
||||||
|
cp_MethodHandle_refkind.readData(len);
|
||||||
|
cp_MethodHandle_member.setIndexByTag(CONSTANT_AnyMember);
|
||||||
|
cp_MethodHandle_member.readData(len);
|
||||||
|
for (int i = 0 ; i < len ; i++) {
|
||||||
|
entry& e = cpMap[i];
|
||||||
|
e.value.i = cp_MethodHandle_refkind.getInt();
|
||||||
|
e.refs = U_NEW(entry*, e.nrefs = 1);
|
||||||
|
e.refs[0] = cp_MethodHandle_member.getRef();
|
||||||
|
CHECK;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
maybe_inline
|
||||||
|
void unpacker::read_method_type(entry* cpMap, int len) {
|
||||||
|
if (len > 0) {
|
||||||
|
checkLegacy(cp_MethodType.name);
|
||||||
|
}
|
||||||
|
cp_MethodType.setIndexByTag(CONSTANT_Signature);
|
||||||
|
cp_MethodType.readData(len);
|
||||||
|
for (int i = 0 ; i < len ; i++) {
|
||||||
|
entry& e = cpMap[i];
|
||||||
|
e.refs = U_NEW(entry*, e.nrefs = 1);
|
||||||
|
e.refs[0] = cp_MethodType.getRef();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
maybe_inline
|
||||||
|
void unpacker::read_bootstrap_methods(entry* cpMap, int len) {
|
||||||
|
if (len > 0) {
|
||||||
|
checkLegacy(cp_BootstrapMethod_ref.name);
|
||||||
|
}
|
||||||
|
cp_BootstrapMethod_ref.setIndexByTag(CONSTANT_MethodHandle);
|
||||||
|
cp_BootstrapMethod_ref.readData(len);
|
||||||
|
|
||||||
|
cp_BootstrapMethod_arg_count.readData(len);
|
||||||
|
int totalArgCount = cp_BootstrapMethod_arg_count.getIntTotal();
|
||||||
|
cp_BootstrapMethod_arg.setIndexByTag(CONSTANT_LoadableValue);
|
||||||
|
cp_BootstrapMethod_arg.readData(totalArgCount);
|
||||||
|
for (int i = 0; i < len; i++) {
|
||||||
|
entry& e = cpMap[i];
|
||||||
|
int argc = cp_BootstrapMethod_arg_count.getInt();
|
||||||
|
e.value.i = argc;
|
||||||
|
e.refs = U_NEW(entry*, e.nrefs = argc + 1);
|
||||||
|
e.refs[0] = cp_BootstrapMethod_ref.getRef();
|
||||||
|
for (int j = 1 ; j < e.nrefs ; j++) {
|
||||||
|
e.refs[j] = cp_BootstrapMethod_arg.getRef();
|
||||||
|
CHECK;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
// Cf. PackageReader.readConstantPool
|
// Cf. PackageReader.readConstantPool
|
||||||
void unpacker::read_cp() {
|
void unpacker::read_cp() {
|
||||||
byte* rp0 = rp;
|
byte* rp0 = rp;
|
||||||
@ -1298,6 +1413,14 @@ void unpacker::read_cp() {
|
|||||||
cpMap[i].tag = tag;
|
cpMap[i].tag = tag;
|
||||||
cpMap[i].inord = i;
|
cpMap[i].inord = i;
|
||||||
}
|
}
|
||||||
|
// Initialize the tag's CP index right away, since it might be needed
|
||||||
|
// in the next pass to initialize the CP for another tag.
|
||||||
|
#ifndef PRODUCT
|
||||||
|
cpindex* ix = &cp.tag_index[tag];
|
||||||
|
assert(ix->ixTag == tag);
|
||||||
|
assert((int)ix->len == len);
|
||||||
|
assert(ix->base1 == cpMap);
|
||||||
|
#endif
|
||||||
|
|
||||||
switch (tag) {
|
switch (tag) {
|
||||||
case CONSTANT_Utf8:
|
case CONSTANT_Utf8:
|
||||||
@ -1344,19 +1467,27 @@ void unpacker::read_cp() {
|
|||||||
CONSTANT_Class, CONSTANT_NameandType,
|
CONSTANT_Class, CONSTANT_NameandType,
|
||||||
cpMap, len);
|
cpMap, len);
|
||||||
break;
|
break;
|
||||||
|
case CONSTANT_MethodHandle:
|
||||||
|
// consumes cp_MethodHandle_refkind and cp_MethodHandle_member
|
||||||
|
read_method_handle(cpMap, len);
|
||||||
|
break;
|
||||||
|
case CONSTANT_MethodType:
|
||||||
|
// consumes cp_MethodType
|
||||||
|
read_method_type(cpMap, len);
|
||||||
|
break;
|
||||||
|
case CONSTANT_InvokeDynamic:
|
||||||
|
read_double_refs(cp_InvokeDynamic_spec, CONSTANT_BootstrapMethod,
|
||||||
|
CONSTANT_NameandType,
|
||||||
|
cpMap, len);
|
||||||
|
break;
|
||||||
|
case CONSTANT_BootstrapMethod:
|
||||||
|
// consumes cp_BootstrapMethod_ref, cp_BootstrapMethod_arg_count and cp_BootstrapMethod_arg
|
||||||
|
read_bootstrap_methods(cpMap, len);
|
||||||
|
break;
|
||||||
default:
|
default:
|
||||||
assert(false);
|
assert(false);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Initialize the tag's CP index right away, since it might be needed
|
|
||||||
// in the next pass to initialize the CP for another tag.
|
|
||||||
#ifndef PRODUCT
|
|
||||||
cpindex* ix = &cp.tag_index[tag];
|
|
||||||
assert(ix->ixTag == tag);
|
|
||||||
assert((int)ix->len == len);
|
|
||||||
assert(ix->base1 == cpMap);
|
|
||||||
#endif
|
|
||||||
CHECK;
|
CHECK;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1791,7 +1922,12 @@ unpacker::attr_definitions::parseLayout(const char* lp, band** &res,
|
|||||||
case 'F': ixTag = CONSTANT_Float; break;
|
case 'F': ixTag = CONSTANT_Float; break;
|
||||||
case 'D': ixTag = CONSTANT_Double; break;
|
case 'D': ixTag = CONSTANT_Double; break;
|
||||||
case 'S': ixTag = CONSTANT_String; break;
|
case 'S': ixTag = CONSTANT_String; break;
|
||||||
case 'Q': ixTag = CONSTANT_Literal; break;
|
case 'Q': ixTag = CONSTANT_FieldSpecific; break;
|
||||||
|
|
||||||
|
// new in 1.7
|
||||||
|
case 'M': ixTag = CONSTANT_MethodHandle; break;
|
||||||
|
case 'T': ixTag = CONSTANT_MethodType; break;
|
||||||
|
case 'L': ixTag = CONSTANT_LoadableValue; break;
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
switch (*lp++) {
|
switch (*lp++) {
|
||||||
@ -1803,6 +1939,11 @@ unpacker::attr_definitions::parseLayout(const char* lp, band** &res,
|
|||||||
case 'I': ixTag = CONSTANT_InterfaceMethodref; break;
|
case 'I': ixTag = CONSTANT_InterfaceMethodref; break;
|
||||||
case 'U': ixTag = CONSTANT_Utf8; break; //utf8_ref
|
case 'U': ixTag = CONSTANT_Utf8; break; //utf8_ref
|
||||||
case 'Q': ixTag = CONSTANT_All; break; //untyped_ref
|
case 'Q': ixTag = CONSTANT_All; break; //untyped_ref
|
||||||
|
|
||||||
|
// new in 1.7
|
||||||
|
case 'Y': ixTag = CONSTANT_InvokeDynamic; break;
|
||||||
|
case 'B': ixTag = CONSTANT_BootstrapMethod; break;
|
||||||
|
case 'N': ixTag = CONSTANT_AnyMember; break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (ixTag == CONSTANT_None) {
|
if (ixTag == CONSTANT_None) {
|
||||||
@ -1873,13 +2014,13 @@ void unpacker::read_attr_defs() {
|
|||||||
|
|
||||||
// Decide whether bands for the optional high flag words are present.
|
// Decide whether bands for the optional high flag words are present.
|
||||||
attr_defs[ATTR_CONTEXT_CLASS]
|
attr_defs[ATTR_CONTEXT_CLASS]
|
||||||
.setHaveLongFlags((archive_options & AO_HAVE_CLASS_FLAGS_HI) != 0);
|
.setHaveLongFlags(testBit(archive_options, AO_HAVE_CLASS_FLAGS_HI));
|
||||||
attr_defs[ATTR_CONTEXT_FIELD]
|
attr_defs[ATTR_CONTEXT_FIELD]
|
||||||
.setHaveLongFlags((archive_options & AO_HAVE_FIELD_FLAGS_HI) != 0);
|
.setHaveLongFlags(testBit(archive_options, AO_HAVE_FIELD_FLAGS_HI));
|
||||||
attr_defs[ATTR_CONTEXT_METHOD]
|
attr_defs[ATTR_CONTEXT_METHOD]
|
||||||
.setHaveLongFlags((archive_options & AO_HAVE_METHOD_FLAGS_HI) != 0);
|
.setHaveLongFlags(testBit(archive_options, AO_HAVE_METHOD_FLAGS_HI));
|
||||||
attr_defs[ATTR_CONTEXT_CODE]
|
attr_defs[ATTR_CONTEXT_CODE]
|
||||||
.setHaveLongFlags((archive_options & AO_HAVE_CODE_FLAGS_HI) != 0);
|
.setHaveLongFlags(testBit(archive_options, AO_HAVE_CODE_FLAGS_HI));
|
||||||
|
|
||||||
// Set up built-in attrs.
|
// Set up built-in attrs.
|
||||||
// (The simple ones are hard-coded. The metadata layouts are not.)
|
// (The simple ones are hard-coded. The metadata layouts are not.)
|
||||||
@ -2579,7 +2720,7 @@ void unpacker::putlayout(band** body) {
|
|||||||
// It has data, so unparse an element.
|
// It has data, so unparse an element.
|
||||||
if (b.ixTag != CONSTANT_None) {
|
if (b.ixTag != CONSTANT_None) {
|
||||||
assert(le_kind == EK_REF);
|
assert(le_kind == EK_REF);
|
||||||
if (b.ixTag == CONSTANT_Literal)
|
if (b.ixTag == CONSTANT_FieldSpecific)
|
||||||
e = b.getRefUsing(cp.getKQIndex());
|
e = b.getRefUsing(cp.getKQIndex());
|
||||||
else
|
else
|
||||||
e = b.getRefN();
|
e = b.getRefN();
|
||||||
@ -2653,13 +2794,13 @@ void unpacker::putlayout(band** body) {
|
|||||||
|
|
||||||
void unpacker::read_files() {
|
void unpacker::read_files() {
|
||||||
file_name.readData(file_count);
|
file_name.readData(file_count);
|
||||||
if ((archive_options & AO_HAVE_FILE_SIZE_HI) != 0)
|
if (testBit(archive_options, AO_HAVE_FILE_SIZE_HI))
|
||||||
file_size_hi.readData(file_count);
|
file_size_hi.readData(file_count);
|
||||||
file_size_lo.readData(file_count);
|
file_size_lo.readData(file_count);
|
||||||
if ((archive_options & AO_HAVE_FILE_MODTIME) != 0)
|
if (testBit(archive_options, AO_HAVE_FILE_MODTIME))
|
||||||
file_modtime.readData(file_count);
|
file_modtime.readData(file_count);
|
||||||
int allFiles = file_count + class_count;
|
int allFiles = file_count + class_count;
|
||||||
if ((archive_options & AO_HAVE_FILE_OPTIONS) != 0) {
|
if (testBit(archive_options, AO_HAVE_FILE_OPTIONS)) {
|
||||||
file_options.readData(file_count);
|
file_options.readData(file_count);
|
||||||
// FO_IS_CLASS_STUB might be set, causing overlap between classes and files
|
// FO_IS_CLASS_STUB might be set, causing overlap between classes and files
|
||||||
for (int i = 0; i < file_count; i++) {
|
for (int i = 0; i < file_count; i++) {
|
||||||
@ -2703,7 +2844,7 @@ void unpacker::get_code_header(int& max_stack,
|
|||||||
max_stack = sc % mod;
|
max_stack = sc % mod;
|
||||||
max_na_locals = sc / mod; // caller must add static, siglen
|
max_na_locals = sc / mod; // caller must add static, siglen
|
||||||
handler_count = nh;
|
handler_count = nh;
|
||||||
if ((archive_options & AO_HAVE_ALL_CODE_FLAGS) != 0)
|
if (testBit(archive_options, AO_HAVE_ALL_CODE_FLAGS))
|
||||||
cflags = -1;
|
cflags = -1;
|
||||||
else
|
else
|
||||||
cflags = 0; // this one has no attributes
|
cflags = 0; // this one has no attributes
|
||||||
@ -2777,12 +2918,14 @@ band* unpacker::ref_band_for_op(int bc) {
|
|||||||
return &bc_longref;
|
return &bc_longref;
|
||||||
case bc_dldc2_w:
|
case bc_dldc2_w:
|
||||||
return &bc_doubleref;
|
return &bc_doubleref;
|
||||||
case bc_aldc:
|
case bc_sldc:
|
||||||
case bc_aldc_w:
|
case bc_sldc_w:
|
||||||
return &bc_stringref;
|
return &bc_stringref;
|
||||||
case bc_cldc:
|
case bc_cldc:
|
||||||
case bc_cldc_w:
|
case bc_cldc_w:
|
||||||
return &bc_classref;
|
return &bc_classref;
|
||||||
|
case bc_qldc: case bc_qldc_w:
|
||||||
|
return &bc_loadablevalueref;
|
||||||
|
|
||||||
case bc_getstatic:
|
case bc_getstatic:
|
||||||
case bc_putstatic:
|
case bc_putstatic:
|
||||||
@ -2796,6 +2939,8 @@ band* unpacker::ref_band_for_op(int bc) {
|
|||||||
return &bc_methodref;
|
return &bc_methodref;
|
||||||
case bc_invokeinterface:
|
case bc_invokeinterface:
|
||||||
return &bc_imethodref;
|
return &bc_imethodref;
|
||||||
|
case bc_invokedynamic:
|
||||||
|
return &bc_indyref;
|
||||||
|
|
||||||
case bc_new:
|
case bc_new:
|
||||||
case bc_anewarray:
|
case bc_anewarray:
|
||||||
@ -3131,6 +3276,71 @@ void cpool::expandSignatures() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool isLoadableValue(int tag) {
|
||||||
|
switch(tag) {
|
||||||
|
case CONSTANT_Integer:
|
||||||
|
case CONSTANT_Float:
|
||||||
|
case CONSTANT_Long:
|
||||||
|
case CONSTANT_Double:
|
||||||
|
case CONSTANT_String:
|
||||||
|
case CONSTANT_Class:
|
||||||
|
case CONSTANT_MethodHandle:
|
||||||
|
case CONSTANT_MethodType:
|
||||||
|
return true;
|
||||||
|
default:
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
/*
|
||||||
|
* this method can be used to size an array using null as the parameter,
|
||||||
|
* thereafter can be reused to initialize the array using a valid pointer
|
||||||
|
* as a parameter.
|
||||||
|
*/
|
||||||
|
int cpool::initLoadableValues(entry** loadable_entries) {
|
||||||
|
int loadable_count = 0;
|
||||||
|
for (int i = 0; i < (int)N_TAGS_IN_ORDER; i++) {
|
||||||
|
int tag = TAGS_IN_ORDER[i];
|
||||||
|
if (!isLoadableValue(tag))
|
||||||
|
continue;
|
||||||
|
if (loadable_entries != NULL) {
|
||||||
|
for (int n = 0 ; n < tag_count[tag] ; n++) {
|
||||||
|
loadable_entries[loadable_count + n] = &entries[tag_base[tag] + n];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
loadable_count += tag_count[tag];
|
||||||
|
}
|
||||||
|
return loadable_count;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Initialize various views into the constant pool.
|
||||||
|
void cpool::initGroupIndexes() {
|
||||||
|
// Initialize All
|
||||||
|
int all_count = 0;
|
||||||
|
for (int tag = CONSTANT_None ; tag < CONSTANT_Limit ; tag++) {
|
||||||
|
all_count += tag_count[tag];
|
||||||
|
}
|
||||||
|
entry* all_entries = &entries[tag_base[CONSTANT_None]];
|
||||||
|
tag_group_count[CONSTANT_All - CONSTANT_All] = all_count;
|
||||||
|
tag_group_index[CONSTANT_All - CONSTANT_All].init(all_count, all_entries, CONSTANT_All);
|
||||||
|
|
||||||
|
// Initialize LoadableValues
|
||||||
|
int loadable_count = initLoadableValues(NULL);
|
||||||
|
entry** loadable_entries = U_NEW(entry*, loadable_count);
|
||||||
|
initLoadableValues(loadable_entries);
|
||||||
|
tag_group_count[CONSTANT_LoadableValue - CONSTANT_All] = loadable_count;
|
||||||
|
tag_group_index[CONSTANT_LoadableValue - CONSTANT_All].init(loadable_count,
|
||||||
|
loadable_entries, CONSTANT_LoadableValue);
|
||||||
|
|
||||||
|
// Initialize AnyMembers
|
||||||
|
int any_count = tag_count[CONSTANT_Fieldref] +
|
||||||
|
tag_count[CONSTANT_Methodref] +
|
||||||
|
tag_count[CONSTANT_InterfaceMethodref];
|
||||||
|
entry *any_entries = &entries[tag_base[CONSTANT_Fieldref]];
|
||||||
|
tag_group_count[CONSTANT_AnyMember - CONSTANT_All] = any_count;
|
||||||
|
tag_group_index[CONSTANT_AnyMember - CONSTANT_All].init(any_count,
|
||||||
|
any_entries, CONSTANT_AnyMember);
|
||||||
|
}
|
||||||
|
|
||||||
void cpool::initMemberIndexes() {
|
void cpool::initMemberIndexes() {
|
||||||
// This function does NOT refer to any class schema.
|
// This function does NOT refer to any class schema.
|
||||||
// It is totally internal to the cpool.
|
// It is totally internal to the cpool.
|
||||||
@ -3238,13 +3448,13 @@ void cpool::initMemberIndexes() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
void entry::requestOutputIndex(cpool& cp, int req) {
|
void entry::requestOutputIndex(cpool& cp, int req) {
|
||||||
assert(outputIndex <= NOT_REQUESTED); // must not have assigned indexes yet
|
assert(outputIndex <= REQUESTED_NONE); // must not have assigned indexes yet
|
||||||
if (tag == CONSTANT_Signature) {
|
if (tag == CONSTANT_Signature) {
|
||||||
ref(0)->requestOutputIndex(cp, req);
|
ref(0)->requestOutputIndex(cp, req);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
assert(req == REQUESTED || req == REQUESTED_LDC);
|
assert(req == REQUESTED || req == REQUESTED_LDC);
|
||||||
if (outputIndex != NOT_REQUESTED) {
|
if (outputIndex != REQUESTED_NONE) {
|
||||||
if (req == REQUESTED_LDC)
|
if (req == REQUESTED_LDC)
|
||||||
outputIndex = req; // this kind has precedence
|
outputIndex = req; // this kind has precedence
|
||||||
return;
|
return;
|
||||||
@ -3252,31 +3462,52 @@ void entry::requestOutputIndex(cpool& cp, int req) {
|
|||||||
outputIndex = req;
|
outputIndex = req;
|
||||||
//assert(!cp.outputEntries.contains(this));
|
//assert(!cp.outputEntries.contains(this));
|
||||||
assert(tag != CONSTANT_Signature);
|
assert(tag != CONSTANT_Signature);
|
||||||
|
// The BSMs are jetisoned to a side table, however all references
|
||||||
|
// that the BSMs refer to, need to be considered.
|
||||||
|
if (tag == CONSTANT_BootstrapMethod) {
|
||||||
|
// this is a a pseudo-op entry; an attribute will be generated later on
|
||||||
|
cp.requested_bsms.add(this);
|
||||||
|
} else {
|
||||||
|
// all other tag types go into real output file CP:
|
||||||
cp.outputEntries.add(this);
|
cp.outputEntries.add(this);
|
||||||
|
}
|
||||||
for (int j = 0; j < nrefs; j++) {
|
for (int j = 0; j < nrefs; j++) {
|
||||||
ref(j)->requestOutputIndex(cp);
|
ref(j)->requestOutputIndex(cp);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void cpool::resetOutputIndexes() {
|
void cpool::resetOutputIndexes() {
|
||||||
int i;
|
/*
|
||||||
|
* reset those few entries that are being used in the current class
|
||||||
|
* (Caution since this method is called after every class written, a loop
|
||||||
|
* over every global constant pool entry would be a quadratic cost.)
|
||||||
|
*/
|
||||||
|
|
||||||
int noes = outputEntries.length();
|
int noes = outputEntries.length();
|
||||||
entry** oes = (entry**) outputEntries.base();
|
entry** oes = (entry**) outputEntries.base();
|
||||||
for (i = 0; i < noes; i++) {
|
for (int i = 0 ; i < noes ; i++) {
|
||||||
entry& e = *oes[i];
|
entry& e = *oes[i];
|
||||||
e.outputIndex = NOT_REQUESTED;
|
e.outputIndex = REQUESTED_NONE;
|
||||||
|
}
|
||||||
|
|
||||||
|
// do the same for bsms and reset them if required
|
||||||
|
int nbsms = requested_bsms.length();
|
||||||
|
entry** boes = (entry**) requested_bsms.base();
|
||||||
|
for (int i = 0 ; i < nbsms ; i++) {
|
||||||
|
entry& e = *boes[i];
|
||||||
|
e.outputIndex = REQUESTED_NONE;
|
||||||
}
|
}
|
||||||
outputIndexLimit = 0;
|
outputIndexLimit = 0;
|
||||||
outputEntries.empty();
|
outputEntries.empty();
|
||||||
#ifndef PRODUCT
|
#ifndef PRODUCT
|
||||||
// they must all be clear now
|
// ensure things are cleared out
|
||||||
for (i = 0; i < (int)nentries; i++)
|
for (int i = 0; i < (int)maxentries; i++)
|
||||||
assert(entries[i].outputIndex == NOT_REQUESTED);
|
assert(entries[i].outputIndex == REQUESTED_NONE);
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
static const byte TAG_ORDER[CONSTANT_Limit] = {
|
static const byte TAG_ORDER[CONSTANT_Limit] = {
|
||||||
0, 1, 0, 2, 3, 4, 5, 7, 6, 10, 11, 12, 9, 8
|
0, 1, 0, 2, 3, 4, 5, 7, 6, 10, 11, 12, 9, 8, 0, 13, 14, 15, 16
|
||||||
};
|
};
|
||||||
|
|
||||||
extern "C"
|
extern "C"
|
||||||
@ -3323,12 +3554,20 @@ void cpool::computeOutputIndexes() {
|
|||||||
if (nentries > 100) checkStep = nentries / 100;
|
if (nentries > 100) checkStep = nentries / 100;
|
||||||
for (i = (int)(checkStart++ % checkStep); i < (int)nentries; i += checkStep) {
|
for (i = (int)(checkStart++ % checkStep); i < (int)nentries; i += checkStep) {
|
||||||
entry& e = entries[i];
|
entry& e = entries[i];
|
||||||
if (e.outputIndex != NOT_REQUESTED) {
|
if (e.tag == CONSTANT_BootstrapMethod) {
|
||||||
|
if (e.outputIndex != REQUESTED_NONE) {
|
||||||
|
assert(requested_bsms.contains(&e));
|
||||||
|
} else {
|
||||||
|
assert(!requested_bsms.contains(&e));
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
if (e.outputIndex != REQUESTED_NONE) {
|
||||||
assert(outputEntries.contains(&e));
|
assert(outputEntries.contains(&e));
|
||||||
} else {
|
} else {
|
||||||
assert(!outputEntries.contains(&e));
|
assert(!outputEntries.contains(&e));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// check hand-initialization of TAG_ORDER
|
// check hand-initialization of TAG_ORDER
|
||||||
for (i = 0; i < (int)N_TAGS_IN_ORDER; i++) {
|
for (i = 0; i < (int)N_TAGS_IN_ORDER; i++) {
|
||||||
@ -3348,7 +3587,7 @@ void cpool::computeOutputIndexes() {
|
|||||||
int nextIndex = 1; // always skip index #0 in output cpool
|
int nextIndex = 1; // always skip index #0 in output cpool
|
||||||
for (i = 0; i < noes; i++) {
|
for (i = 0; i < noes; i++) {
|
||||||
entry& e = *oes[i];
|
entry& e = *oes[i];
|
||||||
assert(e.outputIndex == REQUESTED || e.outputIndex == REQUESTED_LDC);
|
assert(e.outputIndex >= REQUESTED_LDC);
|
||||||
e.outputIndex = nextIndex++;
|
e.outputIndex = nextIndex++;
|
||||||
if (e.isDoubleWord()) nextIndex++; // do not use the next index
|
if (e.isDoubleWord()) nextIndex++; // do not use the next index
|
||||||
}
|
}
|
||||||
@ -3396,7 +3635,7 @@ char* entry::string() {
|
|||||||
default:
|
default:
|
||||||
if (nrefs == 0) {
|
if (nrefs == 0) {
|
||||||
buf = getbuf(20);
|
buf = getbuf(20);
|
||||||
sprintf((char*)buf.ptr, "<tag=%d>", tag);
|
sprintf((char*)buf.ptr, TAG_NAME[tag]);
|
||||||
} else if (nrefs == 1) {
|
} else if (nrefs == 1) {
|
||||||
return refs[0]->string();
|
return refs[0]->string();
|
||||||
} else {
|
} else {
|
||||||
@ -3674,6 +3913,7 @@ void unpacker::reset_cur_classfile() {
|
|||||||
class_fixup_offset.empty();
|
class_fixup_offset.empty();
|
||||||
class_fixup_ref.empty();
|
class_fixup_ref.empty();
|
||||||
requested_ics.empty();
|
requested_ics.empty();
|
||||||
|
cp.requested_bsms.empty();
|
||||||
}
|
}
|
||||||
|
|
||||||
cpindex* cpool::getKQIndex() {
|
cpindex* cpool::getKQIndex() {
|
||||||
@ -3931,13 +4171,15 @@ void unpacker::write_bc_ops() {
|
|||||||
case bc_ildc:
|
case bc_ildc:
|
||||||
case bc_cldc:
|
case bc_cldc:
|
||||||
case bc_fldc:
|
case bc_fldc:
|
||||||
case bc_aldc:
|
case bc_sldc:
|
||||||
|
case bc_qldc:
|
||||||
origBC = bc_ldc;
|
origBC = bc_ldc;
|
||||||
break;
|
break;
|
||||||
case bc_ildc_w:
|
case bc_ildc_w:
|
||||||
case bc_cldc_w:
|
case bc_cldc_w:
|
||||||
case bc_fldc_w:
|
case bc_fldc_w:
|
||||||
case bc_aldc_w:
|
case bc_sldc_w:
|
||||||
|
case bc_qldc_w:
|
||||||
origBC = bc_ldc_w;
|
origBC = bc_ldc_w;
|
||||||
break;
|
break;
|
||||||
case bc_lldc2_w:
|
case bc_lldc2_w:
|
||||||
@ -3962,6 +4204,10 @@ void unpacker::write_bc_ops() {
|
|||||||
int argSize = ref->memberDescr()->descrType()->typeSize();
|
int argSize = ref->memberDescr()->descrType()->typeSize();
|
||||||
putu1_fast(1 + argSize);
|
putu1_fast(1 + argSize);
|
||||||
putu1_fast(0);
|
putu1_fast(0);
|
||||||
|
} else if (origBC == bc_invokedynamic) {
|
||||||
|
// pad the next two byte
|
||||||
|
putu1_fast(0);
|
||||||
|
putu1_fast(0);
|
||||||
}
|
}
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
@ -4353,49 +4599,12 @@ int raw_address_cmp(const void* p1p, const void* p2p) {
|
|||||||
return (p1 > p2)? 1: (p1 < p2)? -1: 0;
|
return (p1 > p2)? 1: (p1 < p2)? -1: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
void unpacker::write_classfile_tail() {
|
/*
|
||||||
cur_classfile_tail.empty();
|
* writes the InnerClass attributes and returns the updated attribute
|
||||||
set_output(&cur_classfile_tail);
|
*/
|
||||||
|
int unpacker::write_ics(int naOffset, int na) {
|
||||||
int i, num;
|
|
||||||
|
|
||||||
attr_definitions& ad = attr_defs[ATTR_CONTEXT_CLASS];
|
|
||||||
|
|
||||||
bool haveLongFlags = ad.haveLongFlags();
|
|
||||||
julong kflags = class_flags_hi.getLong(class_flags_lo, haveLongFlags);
|
|
||||||
julong indexMask = ad.flagIndexMask();
|
|
||||||
|
|
||||||
cur_class = class_this.getRef();
|
|
||||||
cur_super = class_super.getRef();
|
|
||||||
|
|
||||||
CHECK;
|
|
||||||
|
|
||||||
if (cur_super == cur_class) cur_super = null;
|
|
||||||
// special representation for java/lang/Object
|
|
||||||
|
|
||||||
putu2((ushort)(kflags & ~indexMask));
|
|
||||||
putref(cur_class);
|
|
||||||
putref(cur_super);
|
|
||||||
|
|
||||||
putu2(num = class_interface_count.getInt());
|
|
||||||
for (i = 0; i < num; i++) {
|
|
||||||
putref(class_interface.getRef());
|
|
||||||
}
|
|
||||||
|
|
||||||
write_members(class_field_count.getInt(), ATTR_CONTEXT_FIELD);
|
|
||||||
write_members(class_method_count.getInt(), ATTR_CONTEXT_METHOD);
|
|
||||||
CHECK;
|
|
||||||
|
|
||||||
cur_class_has_local_ics = false; // may be set true by write_attrs
|
|
||||||
|
|
||||||
|
|
||||||
int naOffset = (int)wpoffset();
|
|
||||||
int na = write_attrs(ATTR_CONTEXT_CLASS, (kflags & indexMask));
|
|
||||||
|
|
||||||
|
|
||||||
// at the very last, choose which inner classes (if any) pertain to k:
|
|
||||||
#ifdef ASSERT
|
#ifdef ASSERT
|
||||||
for (i = 0; i < ic_count; i++) {
|
for (int i = 0; i < ic_count; i++) {
|
||||||
assert(!ics[i].requested);
|
assert(!ics[i].requested);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
@ -4416,7 +4625,7 @@ void unpacker::write_classfile_tail() {
|
|||||||
// include it and all its outers.
|
// include it and all its outers.
|
||||||
int noes = cp.outputEntries.length();
|
int noes = cp.outputEntries.length();
|
||||||
entry** oes = (entry**) cp.outputEntries.base();
|
entry** oes = (entry**) cp.outputEntries.base();
|
||||||
for (i = 0; i < noes; i++) {
|
for (int i = 0; i < noes; i++) {
|
||||||
entry& e = *oes[i];
|
entry& e = *oes[i];
|
||||||
if (e.tag != CONSTANT_Class) continue; // wrong sort
|
if (e.tag != CONSTANT_Class) continue; // wrong sort
|
||||||
for (inner_class* ic = cp.getIC(&e);
|
for (inner_class* ic = cp.getIC(&e);
|
||||||
@ -4442,10 +4651,10 @@ void unpacker::write_classfile_tail() {
|
|||||||
// Note: extra_ics will be freed up by next call to get_next_file().
|
// Note: extra_ics will be freed up by next call to get_next_file().
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
for (i = 0; i < num_extra_ics; i++) {
|
for (int i = 0; i < num_extra_ics; i++) {
|
||||||
inner_class& extra_ic = extra_ics[i];
|
inner_class& extra_ic = extra_ics[i];
|
||||||
extra_ic.inner = class_InnerClasses_RC.getRef();
|
extra_ic.inner = class_InnerClasses_RC.getRef();
|
||||||
CHECK;
|
CHECK_0;
|
||||||
// Find the corresponding equivalent global IC:
|
// Find the corresponding equivalent global IC:
|
||||||
inner_class* global_ic = cp.getIC(extra_ic.inner);
|
inner_class* global_ic = cp.getIC(extra_ic.inner);
|
||||||
int flags = class_InnerClasses_F.getInt();
|
int flags = class_InnerClasses_F.getInt();
|
||||||
@ -4493,7 +4702,7 @@ void unpacker::write_classfile_tail() {
|
|||||||
putu2(local_ics);
|
putu2(local_ics);
|
||||||
PTRLIST_QSORT(requested_ics, raw_address_cmp);
|
PTRLIST_QSORT(requested_ics, raw_address_cmp);
|
||||||
int num_global_ics = requested_ics.length();
|
int num_global_ics = requested_ics.length();
|
||||||
for (i = -num_global_ics; i < num_extra_ics; i++) {
|
for (int i = -num_global_ics; i < num_extra_ics; i++) {
|
||||||
inner_class* ic;
|
inner_class* ic;
|
||||||
if (i < 0)
|
if (i < 0)
|
||||||
ic = (inner_class*) requested_ics.get(num_global_ics+i);
|
ic = (inner_class*) requested_ics.get(num_global_ics+i);
|
||||||
@ -4512,17 +4721,99 @@ void unpacker::write_classfile_tail() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Tidy up global 'requested' bits:
|
// Tidy up global 'requested' bits:
|
||||||
for (i = requested_ics.length(); --i >= 0; ) {
|
for (int i = requested_ics.length(); --i >= 0; ) {
|
||||||
inner_class* ic = (inner_class*) requested_ics.get(i);
|
inner_class* ic = (inner_class*) requested_ics.get(i);
|
||||||
ic->requested = false;
|
ic->requested = false;
|
||||||
}
|
}
|
||||||
requested_ics.empty();
|
requested_ics.empty();
|
||||||
|
return na;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Writes the BootstrapMethods attribute and returns the updated attribute count
|
||||||
|
*/
|
||||||
|
int unpacker::write_bsms(int naOffset, int na) {
|
||||||
|
cur_class_local_bsm_count = cp.requested_bsms.length();
|
||||||
|
if (cur_class_local_bsm_count > 0) {
|
||||||
|
int noes = cp.outputEntries.length();
|
||||||
|
entry** oes = (entry**) cp.outputEntries.base();
|
||||||
|
PTRLIST_QSORT(cp.requested_bsms, outputEntry_cmp);
|
||||||
|
// append the BootstrapMethods attribute (after the InnerClasses attr):
|
||||||
|
putref(cp.sym[cpool::s_BootstrapMethods]);
|
||||||
|
int sizeOffset = (int)wpoffset();
|
||||||
|
byte* sizewp = wp;
|
||||||
|
putu4(-99); // attr size will be patched
|
||||||
|
putu2(cur_class_local_bsm_count);
|
||||||
|
int written_bsms = 0;
|
||||||
|
for (int i = 0 ; i < cur_class_local_bsm_count ; i++) {
|
||||||
|
entry* e = (entry*)cp.requested_bsms.get(i);
|
||||||
|
assert(e->outputIndex != REQUESTED_NONE);
|
||||||
|
// output index is the index within the array
|
||||||
|
e->outputIndex = i;
|
||||||
|
putref(e->refs[0]); // bsm
|
||||||
|
putu2(e->nrefs-1); // number of args after bsm
|
||||||
|
for (int j = 1; j < e->nrefs; j++) {
|
||||||
|
putref(e->refs[j]);
|
||||||
|
}
|
||||||
|
written_bsms += 1;
|
||||||
|
}
|
||||||
|
assert(written_bsms == cur_class_local_bsm_count); // else insane
|
||||||
|
putu4_at(sizewp, (int)(wp - (sizewp+4))); // size of code attr
|
||||||
|
putu2_at(wp_at(naOffset), ++na); // increment class attr count
|
||||||
|
}
|
||||||
|
return na;
|
||||||
|
}
|
||||||
|
|
||||||
|
void unpacker::write_classfile_tail() {
|
||||||
|
|
||||||
|
cur_classfile_tail.empty();
|
||||||
|
set_output(&cur_classfile_tail);
|
||||||
|
|
||||||
|
int i, num;
|
||||||
|
|
||||||
|
attr_definitions& ad = attr_defs[ATTR_CONTEXT_CLASS];
|
||||||
|
|
||||||
|
bool haveLongFlags = ad.haveLongFlags();
|
||||||
|
julong kflags = class_flags_hi.getLong(class_flags_lo, haveLongFlags);
|
||||||
|
julong indexMask = ad.flagIndexMask();
|
||||||
|
|
||||||
|
cur_class = class_this.getRef();
|
||||||
|
cur_super = class_super.getRef();
|
||||||
CHECK;
|
CHECK;
|
||||||
|
|
||||||
|
if (cur_super == cur_class) cur_super = null;
|
||||||
|
// special representation for java/lang/Object
|
||||||
|
|
||||||
|
putu2((ushort)(kflags & ~indexMask));
|
||||||
|
putref(cur_class);
|
||||||
|
putref(cur_super);
|
||||||
|
|
||||||
|
putu2(num = class_interface_count.getInt());
|
||||||
|
for (i = 0; i < num; i++) {
|
||||||
|
putref(class_interface.getRef());
|
||||||
|
}
|
||||||
|
|
||||||
|
write_members(class_field_count.getInt(), ATTR_CONTEXT_FIELD);
|
||||||
|
write_members(class_method_count.getInt(), ATTR_CONTEXT_METHOD);
|
||||||
|
CHECK;
|
||||||
|
|
||||||
|
cur_class_has_local_ics = false; // may be set true by write_attrs
|
||||||
|
|
||||||
|
int naOffset = (int)wpoffset(); // note the attr count location
|
||||||
|
int na = write_attrs(ATTR_CONTEXT_CLASS, (kflags & indexMask));
|
||||||
|
CHECK;
|
||||||
|
|
||||||
|
na = write_bsms(naOffset, na);
|
||||||
|
CHECK;
|
||||||
|
|
||||||
|
// choose which inner classes (if any) pertain to k:
|
||||||
|
na = write_ics(naOffset, na);
|
||||||
|
CHECK;
|
||||||
|
|
||||||
close_output();
|
close_output();
|
||||||
|
cp.computeOutputIndexes();
|
||||||
|
|
||||||
// rewrite CP references in the tail
|
// rewrite CP references in the tail
|
||||||
cp.computeOutputIndexes();
|
|
||||||
int nextref = 0;
|
int nextref = 0;
|
||||||
for (i = 0; i < (int)class_fixup_type.size(); i++) {
|
for (i = 0; i < (int)class_fixup_type.size(); i++) {
|
||||||
int type = class_fixup_type.getByte(i);
|
int type = class_fixup_type.getByte(i);
|
||||||
@ -4579,9 +4870,18 @@ void unpacker::write_classfile_head() {
|
|||||||
case CONSTANT_Methodref:
|
case CONSTANT_Methodref:
|
||||||
case CONSTANT_InterfaceMethodref:
|
case CONSTANT_InterfaceMethodref:
|
||||||
case CONSTANT_NameandType:
|
case CONSTANT_NameandType:
|
||||||
|
case CONSTANT_InvokeDynamic:
|
||||||
putu2(e.refs[0]->getOutputIndex());
|
putu2(e.refs[0]->getOutputIndex());
|
||||||
putu2(e.refs[1]->getOutputIndex());
|
putu2(e.refs[1]->getOutputIndex());
|
||||||
break;
|
break;
|
||||||
|
case CONSTANT_MethodHandle:
|
||||||
|
putu1(e.value.i);
|
||||||
|
putu2(e.refs[0]->getOutputIndex());
|
||||||
|
break;
|
||||||
|
case CONSTANT_MethodType:
|
||||||
|
putu2(e.refs[0]->getOutputIndex());
|
||||||
|
break;
|
||||||
|
case CONSTANT_BootstrapMethod: // should not happen
|
||||||
default:
|
default:
|
||||||
abort(ERROR_INTERNAL);
|
abort(ERROR_INTERNAL);
|
||||||
}
|
}
|
||||||
@ -4620,11 +4920,11 @@ unpacker::file* unpacker::get_next_file() {
|
|||||||
entry* e = file_name.getRef();
|
entry* e = file_name.getRef();
|
||||||
CHECK_0;
|
CHECK_0;
|
||||||
cur_file.name = e->utf8String();
|
cur_file.name = e->utf8String();
|
||||||
bool haveLongSize = ((archive_options & AO_HAVE_FILE_SIZE_HI) != 0);
|
bool haveLongSize = (testBit(archive_options, AO_HAVE_FILE_SIZE_HI));
|
||||||
cur_file.size = file_size_hi.getLong(file_size_lo, haveLongSize);
|
cur_file.size = file_size_hi.getLong(file_size_lo, haveLongSize);
|
||||||
if ((archive_options & AO_HAVE_FILE_MODTIME) != 0)
|
if (testBit(archive_options, AO_HAVE_FILE_MODTIME))
|
||||||
cur_file.modtime += file_modtime.getInt(); //relative to archive modtime
|
cur_file.modtime += file_modtime.getInt(); //relative to archive modtime
|
||||||
if ((archive_options & AO_HAVE_FILE_OPTIONS) != 0)
|
if (testBit(archive_options, AO_HAVE_FILE_OPTIONS))
|
||||||
cur_file.options |= file_options.getInt() & ~suppress_file_options;
|
cur_file.options |= file_options.getInt() & ~suppress_file_options;
|
||||||
} else if (classes_written < class_count) {
|
} else if (classes_written < class_count) {
|
||||||
// there is a class for a missing file record
|
// there is a class for a missing file record
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (c) 2002, 2008, Oracle and/or its affiliates. All rights reserved.
|
* Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved.
|
||||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||||
*
|
*
|
||||||
* This code is free software; you can redistribute it and/or modify it
|
* This code is free software; you can redistribute it and/or modify it
|
||||||
@ -22,9 +22,6 @@
|
|||||||
* or visit www.oracle.com if you need additional information or have any
|
* or visit www.oracle.com if you need additional information or have any
|
||||||
* questions.
|
* questions.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
// Global Structures
|
// Global Structures
|
||||||
struct jar;
|
struct jar;
|
||||||
struct gunzip;
|
struct gunzip;
|
||||||
@ -70,6 +67,9 @@ struct cpool {
|
|||||||
cpindex tag_index[CONSTANT_Limit];
|
cpindex tag_index[CONSTANT_Limit];
|
||||||
ptrlist tag_extras[CONSTANT_Limit];
|
ptrlist tag_extras[CONSTANT_Limit];
|
||||||
|
|
||||||
|
int tag_group_count[CONSTANT_GroupLimit - CONSTANT_GroupFirst];
|
||||||
|
cpindex tag_group_index[CONSTANT_GroupLimit - CONSTANT_GroupFirst];
|
||||||
|
|
||||||
cpindex* member_indexes; // indexed by 2*CONSTANT_Class.inord
|
cpindex* member_indexes; // indexed by 2*CONSTANT_Class.inord
|
||||||
cpindex* getFieldIndex(entry* classRef);
|
cpindex* getFieldIndex(entry* classRef);
|
||||||
cpindex* getMethodIndex(entry* classRef);
|
cpindex* getMethodIndex(entry* classRef);
|
||||||
@ -82,6 +82,7 @@ struct cpool {
|
|||||||
|
|
||||||
int outputIndexLimit; // index limit after renumbering
|
int outputIndexLimit; // index limit after renumbering
|
||||||
ptrlist outputEntries; // list of entry* needing output idx assigned
|
ptrlist outputEntries; // list of entry* needing output idx assigned
|
||||||
|
ptrlist requested_bsms; // which bsms need output?
|
||||||
|
|
||||||
entry** hashTab;
|
entry** hashTab;
|
||||||
uint hashTabLength;
|
uint hashTabLength;
|
||||||
@ -100,24 +101,36 @@ struct cpool {
|
|||||||
entry* sym[s_LIMIT];
|
entry* sym[s_LIMIT];
|
||||||
|
|
||||||
// read counts from hdr, allocate main arrays
|
// read counts from hdr, allocate main arrays
|
||||||
enum { NUM_COUNTS = 12 };
|
void init(unpacker* u, int counts[CONSTANT_Limit]);
|
||||||
void init(unpacker* u, int counts[NUM_COUNTS]);
|
|
||||||
|
|
||||||
// pointer to outer unpacker, for error checks etc.
|
// pointer to outer unpacker, for error checks etc.
|
||||||
unpacker* u;
|
unpacker* u;
|
||||||
|
|
||||||
int getCount(byte tag) {
|
int getCount(byte tag) {
|
||||||
|
if ((uint)tag >= CONSTANT_GroupFirst) {
|
||||||
|
assert((uint)tag < CONSTANT_GroupLimit);
|
||||||
|
return tag_group_count[(uint)tag - CONSTANT_GroupFirst];
|
||||||
|
} else {
|
||||||
assert((uint)tag < CONSTANT_Limit);
|
assert((uint)tag < CONSTANT_Limit);
|
||||||
return tag_count[tag];
|
return tag_count[(uint)tag];
|
||||||
|
}
|
||||||
}
|
}
|
||||||
cpindex* getIndex(byte tag) {
|
cpindex* getIndex(byte tag) {
|
||||||
|
if ((uint)tag >= CONSTANT_GroupFirst) {
|
||||||
|
assert((uint)tag < CONSTANT_GroupLimit);
|
||||||
|
return &tag_group_index[(uint)tag - CONSTANT_GroupFirst];
|
||||||
|
} else {
|
||||||
assert((uint)tag < CONSTANT_Limit);
|
assert((uint)tag < CONSTANT_Limit);
|
||||||
return &tag_index[tag];
|
return &tag_index[(uint)tag];
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
cpindex* getKQIndex(); // uses cur_descr
|
cpindex* getKQIndex(); // uses cur_descr
|
||||||
|
|
||||||
void expandSignatures();
|
void expandSignatures();
|
||||||
|
void initGroupIndexes();
|
||||||
void initMemberIndexes();
|
void initMemberIndexes();
|
||||||
|
int initLoadableValues(entry** loadable_entries);
|
||||||
|
|
||||||
void computeOutputOrder();
|
void computeOutputOrder();
|
||||||
void computeOutputIndexes();
|
void computeOutputIndexes();
|
||||||
@ -234,6 +247,7 @@ struct unpacker {
|
|||||||
int cur_descr_flags; // flags corresponding to cur_descr
|
int cur_descr_flags; // flags corresponding to cur_descr
|
||||||
int cur_class_minver, cur_class_majver;
|
int cur_class_minver, cur_class_majver;
|
||||||
bool cur_class_has_local_ics;
|
bool cur_class_has_local_ics;
|
||||||
|
int cur_class_local_bsm_count;
|
||||||
fillbytes cur_classfile_head;
|
fillbytes cur_classfile_head;
|
||||||
fillbytes cur_classfile_tail;
|
fillbytes cur_classfile_tail;
|
||||||
int files_written; // also tells which file we're working on
|
int files_written; // also tells which file we're working on
|
||||||
@ -412,7 +426,7 @@ struct unpacker {
|
|||||||
void abort(const char* s = null);
|
void abort(const char* s = null);
|
||||||
bool aborting() { return abort_message != null; }
|
bool aborting() { return abort_message != null; }
|
||||||
static unpacker* current(); // find current instance
|
static unpacker* current(); // find current instance
|
||||||
|
void checkLegacy(const char* name);
|
||||||
// Output management
|
// Output management
|
||||||
void set_output(fillbytes* which) {
|
void set_output(fillbytes* which) {
|
||||||
assert(wp == null);
|
assert(wp == null);
|
||||||
@ -464,6 +478,8 @@ struct unpacker {
|
|||||||
void write_bc_ops();
|
void write_bc_ops();
|
||||||
void write_members(int num, int attrc); // attrc=ATTR_CONTEXT_FIELD/METHOD
|
void write_members(int num, int attrc); // attrc=ATTR_CONTEXT_FIELD/METHOD
|
||||||
int write_attrs(int attrc, julong indexBits);
|
int write_attrs(int attrc, julong indexBits);
|
||||||
|
int write_ics(int naOffset, int na);
|
||||||
|
int write_bsms(int naOffset, int na);
|
||||||
|
|
||||||
// The readers
|
// The readers
|
||||||
void read_bands();
|
void read_bands();
|
||||||
@ -484,6 +500,9 @@ struct unpacker {
|
|||||||
void read_single_refs(band& cp_band, byte refTag, entry* cpMap, int len);
|
void read_single_refs(band& cp_band, byte refTag, entry* cpMap, int len);
|
||||||
void read_double_refs(band& cp_band, byte ref1Tag, byte ref2Tag, entry* cpMap, int len);
|
void read_double_refs(band& cp_band, byte ref1Tag, byte ref2Tag, entry* cpMap, int len);
|
||||||
void read_signature_values(entry* cpMap, int len);
|
void read_signature_values(entry* cpMap, int len);
|
||||||
|
void read_method_handle(entry* cpMap, int len);
|
||||||
|
void read_method_type(entry* cpMap, int len);
|
||||||
|
void read_bootstrap_methods(entry* cpMap, int len);
|
||||||
};
|
};
|
||||||
|
|
||||||
inline void cpool::abort(const char* msg) { u->abort(msg); }
|
inline void cpool::abort(const char* msg) { u->abort(msg); }
|
||||||
|
@ -117,6 +117,7 @@ Java_java_util_zip_ZipFile_open(JNIEnv *env, jclass cls, jstring name,
|
|||||||
result = ptr_to_jlong(zip);
|
result = ptr_to_jlong(zip);
|
||||||
} else if (msg != 0) {
|
} else if (msg != 0) {
|
||||||
ThrowZipException(env, msg);
|
ThrowZipException(env, msg);
|
||||||
|
free(msg);
|
||||||
} else if (errno == ENOMEM) {
|
} else if (errno == ENOMEM) {
|
||||||
JNU_ThrowOutOfMemoryError(env, 0);
|
JNU_ThrowOutOfMemoryError(env, 0);
|
||||||
} else {
|
} else {
|
||||||
|
@ -726,7 +726,7 @@ readCEN(jzfile *zip, jint knownTotal)
|
|||||||
* Opens a zip file with the specified mode. Returns the jzfile object
|
* Opens a zip file with the specified mode. Returns the jzfile object
|
||||||
* or NULL if an error occurred. If a zip error occurred then *pmsg will
|
* or NULL if an error occurred. If a zip error occurred then *pmsg will
|
||||||
* be set to the error message text if pmsg != 0. Otherwise, *pmsg will be
|
* be set to the error message text if pmsg != 0. Otherwise, *pmsg will be
|
||||||
* set to NULL.
|
* set to NULL. Caller is responsible to free the error message.
|
||||||
*/
|
*/
|
||||||
jzfile *
|
jzfile *
|
||||||
ZIP_Open_Generic(const char *name, char **pmsg, int mode, jlong lastModified)
|
ZIP_Open_Generic(const char *name, char **pmsg, int mode, jlong lastModified)
|
||||||
@ -751,12 +751,12 @@ ZIP_Open_Generic(const char *name, char **pmsg, int mode, jlong lastModified)
|
|||||||
* Returns the jzfile corresponding to the given file name from the cache of
|
* Returns the jzfile corresponding to the given file name from the cache of
|
||||||
* zip files, or NULL if the file is not in the cache. If the name is longer
|
* zip files, or NULL if the file is not in the cache. If the name is longer
|
||||||
* than PATH_MAX or a zip error occurred then *pmsg will be set to the error
|
* than PATH_MAX or a zip error occurred then *pmsg will be set to the error
|
||||||
* message text if pmsg != 0. Otherwise, *pmsg will be set to NULL.
|
* message text if pmsg != 0. Otherwise, *pmsg will be set to NULL. Caller
|
||||||
|
* is responsible to free the error message.
|
||||||
*/
|
*/
|
||||||
jzfile *
|
jzfile *
|
||||||
ZIP_Get_From_Cache(const char *name, char **pmsg, jlong lastModified)
|
ZIP_Get_From_Cache(const char *name, char **pmsg, jlong lastModified)
|
||||||
{
|
{
|
||||||
static char errbuf[256];
|
|
||||||
char buf[PATH_MAX];
|
char buf[PATH_MAX];
|
||||||
jzfile *zip;
|
jzfile *zip;
|
||||||
|
|
||||||
@ -771,7 +771,7 @@ ZIP_Get_From_Cache(const char *name, char **pmsg, jlong lastModified)
|
|||||||
|
|
||||||
if (strlen(name) >= PATH_MAX) {
|
if (strlen(name) >= PATH_MAX) {
|
||||||
if (pmsg) {
|
if (pmsg) {
|
||||||
*pmsg = "zip file name too long";
|
*pmsg = strdup("zip file name too long");
|
||||||
}
|
}
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
@ -796,7 +796,8 @@ ZIP_Get_From_Cache(const char *name, char **pmsg, jlong lastModified)
|
|||||||
* Reads data from the given file descriptor to create a jzfile, puts the
|
* Reads data from the given file descriptor to create a jzfile, puts the
|
||||||
* jzfile in a cache, and returns that jzfile. Returns NULL in case of error.
|
* jzfile in a cache, and returns that jzfile. Returns NULL in case of error.
|
||||||
* If a zip error occurs, then *pmsg will be set to the error message text if
|
* If a zip error occurs, then *pmsg will be set to the error message text if
|
||||||
* pmsg != 0. Otherwise, *pmsg will be set to NULL.
|
* pmsg != 0. Otherwise, *pmsg will be set to NULL. Caller is responsible to
|
||||||
|
* free the error message.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
jzfile *
|
jzfile *
|
||||||
@ -809,7 +810,7 @@ jzfile *
|
|||||||
ZIP_Put_In_Cache0(const char *name, ZFILE zfd, char **pmsg, jlong lastModified,
|
ZIP_Put_In_Cache0(const char *name, ZFILE zfd, char **pmsg, jlong lastModified,
|
||||||
jboolean usemmap)
|
jboolean usemmap)
|
||||||
{
|
{
|
||||||
static char errbuf[256];
|
char errbuf[256];
|
||||||
jlong len;
|
jlong len;
|
||||||
jzfile *zip;
|
jzfile *zip;
|
||||||
|
|
||||||
@ -825,7 +826,7 @@ ZIP_Put_In_Cache0(const char *name, ZFILE zfd, char **pmsg, jlong lastModified,
|
|||||||
|
|
||||||
if (zfd == -1) {
|
if (zfd == -1) {
|
||||||
if (pmsg && JVM_GetLastErrorString(errbuf, sizeof(errbuf)) > 0)
|
if (pmsg && JVM_GetLastErrorString(errbuf, sizeof(errbuf)) > 0)
|
||||||
*pmsg = errbuf;
|
*pmsg = strdup(errbuf);
|
||||||
freeZip(zip);
|
freeZip(zip);
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
@ -834,11 +835,11 @@ ZIP_Put_In_Cache0(const char *name, ZFILE zfd, char **pmsg, jlong lastModified,
|
|||||||
if (len <= 0) {
|
if (len <= 0) {
|
||||||
if (len == 0) { /* zip file is empty */
|
if (len == 0) { /* zip file is empty */
|
||||||
if (pmsg) {
|
if (pmsg) {
|
||||||
*pmsg = "zip file is empty";
|
*pmsg = strdup("zip file is empty");
|
||||||
}
|
}
|
||||||
} else { /* error */
|
} else { /* error */
|
||||||
if (pmsg && JVM_GetLastErrorString(errbuf, sizeof(errbuf)) > 0)
|
if (pmsg && JVM_GetLastErrorString(errbuf, sizeof(errbuf)) > 0)
|
||||||
*pmsg = errbuf;
|
*pmsg = strdup(errbuf);
|
||||||
}
|
}
|
||||||
ZFILE_Close(zfd);
|
ZFILE_Close(zfd);
|
||||||
freeZip(zip);
|
freeZip(zip);
|
||||||
@ -850,7 +851,8 @@ ZIP_Put_In_Cache0(const char *name, ZFILE zfd, char **pmsg, jlong lastModified,
|
|||||||
/* An error occurred while trying to read the zip file */
|
/* An error occurred while trying to read the zip file */
|
||||||
if (pmsg != 0) {
|
if (pmsg != 0) {
|
||||||
/* Set the zip error message */
|
/* Set the zip error message */
|
||||||
*pmsg = zip->msg;
|
if (zip->msg != NULL)
|
||||||
|
*pmsg = strdup(zip->msg);
|
||||||
}
|
}
|
||||||
freeZip(zip);
|
freeZip(zip);
|
||||||
return NULL;
|
return NULL;
|
||||||
@ -867,12 +869,17 @@ ZIP_Put_In_Cache0(const char *name, ZFILE zfd, char **pmsg, jlong lastModified,
|
|||||||
* Opens a zip file for reading. Returns the jzfile object or NULL
|
* Opens a zip file for reading. Returns the jzfile object or NULL
|
||||||
* if an error occurred. If a zip error occurred then *msg will be
|
* if an error occurred. If a zip error occurred then *msg will be
|
||||||
* set to the error message text if msg != 0. Otherwise, *msg will be
|
* set to the error message text if msg != 0. Otherwise, *msg will be
|
||||||
* set to NULL.
|
* set to NULL. Caller doesn't need to free the error message.
|
||||||
*/
|
*/
|
||||||
jzfile * JNICALL
|
jzfile * JNICALL
|
||||||
ZIP_Open(const char *name, char **pmsg)
|
ZIP_Open(const char *name, char **pmsg)
|
||||||
{
|
{
|
||||||
return ZIP_Open_Generic(name, pmsg, O_RDONLY, 0);
|
jzfile *file = ZIP_Open_Generic(name, pmsg, O_RDONLY, 0);
|
||||||
|
if (file == NULL && pmsg != NULL && *pmsg != NULL) {
|
||||||
|
free(*pmsg);
|
||||||
|
*pmsg = "Zip file open error";
|
||||||
|
}
|
||||||
|
return file;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -48,7 +48,12 @@ public class FileSystemImpl extends FileSystem {
|
|||||||
// Initialization
|
// Initialization
|
||||||
|
|
||||||
static {
|
static {
|
||||||
java.security.AccessController
|
java.security.AccessController.doPrivileged(
|
||||||
.doPrivileged(new sun.security.action.LoadLibraryAction("management"));
|
new java.security.PrivilegedAction<Void>() {
|
||||||
|
public Void run() {
|
||||||
|
System.loadLibrary("management");
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -251,7 +251,12 @@ public class ResolverConfigurationImpl
|
|||||||
|
|
||||||
static {
|
static {
|
||||||
java.security.AccessController.doPrivileged(
|
java.security.AccessController.doPrivileged(
|
||||||
new sun.security.action.LoadLibraryAction("net"));
|
new java.security.PrivilegedAction<Void>() {
|
||||||
|
public Void run() {
|
||||||
|
System.loadLibrary("net");
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
|
* Copyright (c) 2008, 2012, Oracle and/or its affiliates. All rights reserved.
|
||||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||||
*
|
*
|
||||||
* This code is free software; you can redistribute it and/or modify it
|
* This code is free software; you can redistribute it and/or modify it
|
||||||
@ -50,7 +50,7 @@ public class DefaultAsynchronousChannelProvider {
|
|||||||
return new SolarisAsynchronousChannelProvider();
|
return new SolarisAsynchronousChannelProvider();
|
||||||
if (osname.equals("Linux"))
|
if (osname.equals("Linux"))
|
||||||
return new LinuxAsynchronousChannelProvider();
|
return new LinuxAsynchronousChannelProvider();
|
||||||
if (osname.startsWith("Mac OS"))
|
if (osname.contains("OS X"))
|
||||||
return new BsdAsynchronousChannelProvider();
|
return new BsdAsynchronousChannelProvider();
|
||||||
throw new InternalError("platform not recognized");
|
throw new InternalError("platform not recognized");
|
||||||
}
|
}
|
||||||
|
@ -1100,7 +1100,12 @@ public class SctpChannelImpl extends SctpChannel
|
|||||||
static {
|
static {
|
||||||
Util.load(); /* loads nio & net native libraries */
|
Util.load(); /* loads nio & net native libraries */
|
||||||
java.security.AccessController.doPrivileged(
|
java.security.AccessController.doPrivileged(
|
||||||
new sun.security.action.LoadLibraryAction("sctp"));
|
new java.security.PrivilegedAction<Void>() {
|
||||||
|
public Void run() {
|
||||||
|
System.loadLibrary("sctp");
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
});
|
||||||
initIDs();
|
initIDs();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -989,6 +989,11 @@ public class SctpMultiChannelImpl extends SctpMultiChannel
|
|||||||
static {
|
static {
|
||||||
Util.load(); /* loads nio & net native libraries */
|
Util.load(); /* loads nio & net native libraries */
|
||||||
java.security.AccessController.doPrivileged(
|
java.security.AccessController.doPrivileged(
|
||||||
new sun.security.action.LoadLibraryAction("sctp"));
|
new java.security.PrivilegedAction<Void>() {
|
||||||
|
public Void run() {
|
||||||
|
System.loadLibrary("sctp");
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -428,7 +428,12 @@ public class SctpServerChannelImpl extends SctpServerChannel
|
|||||||
static {
|
static {
|
||||||
Util.load(); // loads nio & net native libraries
|
Util.load(); // loads nio & net native libraries
|
||||||
java.security.AccessController.doPrivileged(
|
java.security.AccessController.doPrivileged(
|
||||||
new sun.security.action.LoadLibraryAction("sctp"));
|
new java.security.PrivilegedAction<Void>() {
|
||||||
|
public Void run() {
|
||||||
|
System.loadLibrary("sctp");
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
});
|
||||||
initIDs();
|
initIDs();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
|
* Copyright (c) 2008, 2012, Oracle and/or its affiliates. All rights reserved.
|
||||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||||
*
|
*
|
||||||
* This code is free software; you can redistribute it and/or modify it
|
* This code is free software; you can redistribute it and/or modify it
|
||||||
@ -68,7 +68,7 @@ public class DefaultFileSystemProvider {
|
|||||||
return createProvider("sun.nio.fs.SolarisFileSystemProvider");
|
return createProvider("sun.nio.fs.SolarisFileSystemProvider");
|
||||||
if (osname.equals("Linux"))
|
if (osname.equals("Linux"))
|
||||||
return createProvider("sun.nio.fs.LinuxFileSystemProvider");
|
return createProvider("sun.nio.fs.LinuxFileSystemProvider");
|
||||||
if (osname.equals("Darwin") || osname.startsWith("Mac OS X"))
|
if (osname.equals("Darwin") || osname.contains("OS X"))
|
||||||
return createProvider("sun.nio.fs.BsdFileSystemProvider");
|
return createProvider("sun.nio.fs.BsdFileSystemProvider");
|
||||||
throw new AssertionError("Platform not recognized");
|
throw new AssertionError("Platform not recognized");
|
||||||
}
|
}
|
||||||
|
@ -314,7 +314,7 @@ class SolarisWatchService
|
|||||||
fileKey2WatchKey.put(fileKey, watchKey);
|
fileKey2WatchKey.put(fileKey, watchKey);
|
||||||
|
|
||||||
// register all entries in directory
|
// register all entries in directory
|
||||||
registerChildren(dir, watchKey, false);
|
registerChildren(dir, watchKey, false, false);
|
||||||
|
|
||||||
return watchKey;
|
return watchKey;
|
||||||
}
|
}
|
||||||
@ -486,7 +486,8 @@ class SolarisWatchService
|
|||||||
void processDirectoryEvents(SolarisWatchKey key, int mask) {
|
void processDirectoryEvents(SolarisWatchKey key, int mask) {
|
||||||
if ((mask & (FILE_MODIFIED | FILE_ATTRIB)) != 0) {
|
if ((mask & (FILE_MODIFIED | FILE_ATTRIB)) != 0) {
|
||||||
registerChildren(key.getDirectory(), key,
|
registerChildren(key.getDirectory(), key,
|
||||||
key.events().contains(StandardWatchEventKinds.ENTRY_CREATE));
|
key.events().contains(StandardWatchEventKinds.ENTRY_CREATE),
|
||||||
|
key.events().contains(StandardWatchEventKinds.ENTRY_DELETE));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -535,14 +536,16 @@ class SolarisWatchService
|
|||||||
/**
|
/**
|
||||||
* Registers all entries in the given directory
|
* Registers all entries in the given directory
|
||||||
*
|
*
|
||||||
* The {@code sendEvents} parameter indicates if ENTRY_CREATE events
|
* The {@code sendCreateEvents} and {@code sendDeleteEvents} parameters
|
||||||
* should be queued when new entries are found. When initially
|
* indicates if ENTRY_CREATE and ENTRY_DELETE events should be queued
|
||||||
* registering a directory then will always be false. When re-scanning
|
* when new entries are found. When initially registering a directory
|
||||||
* a directory then it depends on if the event is enabled or not.
|
* they will always be false. When re-scanning a directory then it
|
||||||
|
* depends on if the events are enabled or not.
|
||||||
*/
|
*/
|
||||||
void registerChildren(UnixPath dir,
|
void registerChildren(UnixPath dir,
|
||||||
SolarisWatchKey parent,
|
SolarisWatchKey parent,
|
||||||
boolean sendEvents)
|
boolean sendCreateEvents,
|
||||||
|
boolean sendDeleteEvents)
|
||||||
{
|
{
|
||||||
// if the ENTRY_MODIFY event is not enabled then we don't need
|
// if the ENTRY_MODIFY event is not enabled then we don't need
|
||||||
// modification events for entries in the directory
|
// modification events for entries in the directory
|
||||||
@ -550,14 +553,7 @@ class SolarisWatchService
|
|||||||
if (parent.events().contains(StandardWatchEventKinds.ENTRY_MODIFY))
|
if (parent.events().contains(StandardWatchEventKinds.ENTRY_MODIFY))
|
||||||
events |= (FILE_MODIFIED | FILE_ATTRIB);
|
events |= (FILE_MODIFIED | FILE_ATTRIB);
|
||||||
|
|
||||||
DirectoryStream<Path> stream = null;
|
try (DirectoryStream<Path> stream = Files.newDirectoryStream(dir)) {
|
||||||
try {
|
|
||||||
stream = Files.newDirectoryStream(dir);
|
|
||||||
} catch (IOException x) {
|
|
||||||
// nothing we can do
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
try {
|
|
||||||
for (Path entry: stream) {
|
for (Path entry: stream) {
|
||||||
Path name = entry.getFileName();
|
Path name = entry.getFileName();
|
||||||
|
|
||||||
@ -565,32 +561,34 @@ class SolarisWatchService
|
|||||||
if (parent.getChild(name) != null)
|
if (parent.getChild(name) != null)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
// send ENTRY_CREATE if enabled
|
// attempt to register entry
|
||||||
if (sendEvents) {
|
|
||||||
parent.signalEvent(StandardWatchEventKinds.ENTRY_CREATE, name);
|
|
||||||
}
|
|
||||||
|
|
||||||
// register it
|
|
||||||
long object = 0L;
|
long object = 0L;
|
||||||
|
int errno = 0;
|
||||||
try {
|
try {
|
||||||
object = registerImpl((UnixPath)entry, events);
|
object = registerImpl((UnixPath)entry, events);
|
||||||
} catch (UnixException x) {
|
} catch (UnixException x) {
|
||||||
// can't register so ignore for now.
|
errno = x.errno();
|
||||||
continue;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
boolean registered = (object != 0L);
|
||||||
|
boolean deleted = (errno == ENOENT);
|
||||||
|
|
||||||
|
if (registered) {
|
||||||
// create node
|
// create node
|
||||||
EntryNode node = new EntryNode(object, entry.getFileName(), parent);
|
EntryNode node = new EntryNode(object, entry.getFileName(), parent);
|
||||||
// tell the parent about it
|
// tell the parent about it
|
||||||
parent.addChild(entry.getFileName(), node);
|
parent.addChild(entry.getFileName(), node);
|
||||||
object2Node.put(object, node);
|
object2Node.put(object, node);
|
||||||
}
|
}
|
||||||
} catch (ConcurrentModificationException x) {
|
|
||||||
// error during iteration which we ignore for now
|
if (sendCreateEvents && (registered || deleted))
|
||||||
} finally {
|
parent.signalEvent(StandardWatchEventKinds.ENTRY_CREATE, name);
|
||||||
try {
|
if (sendDeleteEvents && deleted)
|
||||||
stream.close();
|
parent.signalEvent(StandardWatchEventKinds.ENTRY_DELETE, name);
|
||||||
} catch (IOException x) { }
|
|
||||||
|
}
|
||||||
|
} catch (DirectoryIteratorException | IOException x) {
|
||||||
|
// nothing we can do
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -77,7 +77,12 @@ public class CUPSPrinter {
|
|||||||
static {
|
static {
|
||||||
// load awt library to access native code
|
// load awt library to access native code
|
||||||
java.security.AccessController.doPrivileged(
|
java.security.AccessController.doPrivileged(
|
||||||
new sun.security.action.LoadLibraryAction("awt"));
|
new java.security.PrivilegedAction<Void>() {
|
||||||
|
public Void run() {
|
||||||
|
System.loadLibrary("awt");
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
});
|
||||||
libFound = initIDs();
|
libFound = initIDs();
|
||||||
if (libFound) {
|
if (libFound) {
|
||||||
cupsServer = getCupsServer();
|
cupsServer = getCupsServer();
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (c) 2000, 2008, Oracle and/or its affiliates. All rights reserved.
|
* Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
|
||||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||||
*
|
*
|
||||||
* This code is free software; you can redistribute it and/or modify it
|
* This code is free software; you can redistribute it and/or modify it
|
||||||
@ -120,7 +120,7 @@ public class UnixPrintServiceLookup extends PrintServiceLookup
|
|||||||
|
|
||||||
static boolean isBSD() {
|
static boolean isBSD() {
|
||||||
return (osname.equals("Linux") ||
|
return (osname.equals("Linux") ||
|
||||||
osname.startsWith("Mac OS X"));
|
osname.contains("OS X"));
|
||||||
}
|
}
|
||||||
|
|
||||||
static final int UNINITIALIZED = -1;
|
static final int UNINITIALIZED = -1;
|
||||||
|
@ -84,6 +84,7 @@ static jfieldID pdsi_ttlID;
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
extern void setDefaultScopeID(JNIEnv *env, struct sockaddr *him);
|
extern void setDefaultScopeID(JNIEnv *env, struct sockaddr *him);
|
||||||
|
extern int getDefaultScopeID(JNIEnv *env);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Returns a java.lang.Integer based on 'i'
|
* Returns a java.lang.Integer based on 'i'
|
||||||
@ -2418,7 +2419,11 @@ static void mcast_join_leave(JNIEnv *env, jobject this,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
#ifdef MACOSX
|
||||||
|
if (family == AF_INET6 && index == 0) {
|
||||||
|
index = getDefaultScopeID(env);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
mname6.ipv6mr_interface = index;
|
mname6.ipv6mr_interface = index;
|
||||||
} else {
|
} else {
|
||||||
jint idx = (*env)->GetIntField(env, niObj, ni_indexID);
|
jint idx = (*env)->GetIntField(env, niObj, ni_indexID);
|
||||||
|
@ -109,6 +109,24 @@ void setDefaultScopeID(JNIEnv *env, struct sockaddr *him)
|
|||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
int getDefaultScopeID(JNIEnv *env) {
|
||||||
|
static jclass ni_class = NULL;
|
||||||
|
static jfieldID ni_defaultIndexID;
|
||||||
|
if (ni_class == NULL) {
|
||||||
|
jclass c = (*env)->FindClass(env, "java/net/NetworkInterface");
|
||||||
|
CHECK_NULL(c);
|
||||||
|
c = (*env)->NewGlobalRef(env, c);
|
||||||
|
CHECK_NULL(c);
|
||||||
|
ni_defaultIndexID = (*env)->GetStaticFieldID(env, c,
|
||||||
|
"defaultIndex", "I");
|
||||||
|
ni_class = c;
|
||||||
|
}
|
||||||
|
int defaultIndex = 0;
|
||||||
|
defaultIndex = (*env)->GetStaticIntField(env, ni_class,
|
||||||
|
ni_defaultIndexID);
|
||||||
|
return defaultIndex;
|
||||||
|
}
|
||||||
|
|
||||||
#ifdef __solaris__
|
#ifdef __solaris__
|
||||||
static int init_tcp_max_buf, init_udp_max_buf;
|
static int init_tcp_max_buf, init_udp_max_buf;
|
||||||
static int tcp_max_buf;
|
static int tcp_max_buf;
|
||||||
|
@ -77,7 +77,7 @@ Java_sun_nio_ch_DatagramChannelImpl_initIDs(JNIEnv *env, jclass clazz)
|
|||||||
|
|
||||||
JNIEXPORT void JNICALL
|
JNIEXPORT void JNICALL
|
||||||
Java_sun_nio_ch_DatagramChannelImpl_disconnect0(JNIEnv *env, jobject this,
|
Java_sun_nio_ch_DatagramChannelImpl_disconnect0(JNIEnv *env, jobject this,
|
||||||
jobject fdo)
|
jobject fdo, jboolean isIPv6)
|
||||||
{
|
{
|
||||||
jint fd = fdval(env, fdo);
|
jint fd = fdval(env, fdo);
|
||||||
int rv;
|
int rv;
|
||||||
@ -94,7 +94,7 @@ Java_sun_nio_ch_DatagramChannelImpl_disconnect0(JNIEnv *env, jobject this,
|
|||||||
memset(&sa, 0, sizeof(sa));
|
memset(&sa, 0, sizeof(sa));
|
||||||
|
|
||||||
#ifdef AF_INET6
|
#ifdef AF_INET6
|
||||||
if (ipv6_available()) {
|
if (isIPv6) {
|
||||||
struct sockaddr_in6 *him6 = (struct sockaddr_in6 *)&sa;
|
struct sockaddr_in6 *him6 = (struct sockaddr_in6 *)&sa;
|
||||||
#if defined(_ALLBSD_SOURCE)
|
#if defined(_ALLBSD_SOURCE)
|
||||||
him6->sin6_family = AF_INET6;
|
him6->sin6_family = AF_INET6;
|
||||||
|
@ -37,8 +37,6 @@ import java.util.*;
|
|||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.concurrent.*;
|
import java.util.concurrent.*;
|
||||||
|
|
||||||
import sun.security.action.LoadLibraryAction;
|
|
||||||
|
|
||||||
import static sun.awt.shell.Win32ShellFolder2.*;
|
import static sun.awt.shell.Win32ShellFolder2.*;
|
||||||
import sun.awt.OSInfo;
|
import sun.awt.OSInfo;
|
||||||
|
|
||||||
@ -56,7 +54,13 @@ public class Win32ShellFolderManager2 extends ShellFolderManager {
|
|||||||
|
|
||||||
static {
|
static {
|
||||||
// Load library here
|
// Load library here
|
||||||
AccessController.doPrivileged(new LoadLibraryAction("awt"));
|
AccessController.doPrivileged(
|
||||||
|
new java.security.PrivilegedAction<Void>() {
|
||||||
|
public Void run() {
|
||||||
|
System.loadLibrary("awt");
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
public ShellFolder createShellFolder(File file) throws FileNotFoundException {
|
public ShellFolder createShellFolder(File file) throws FileNotFoundException {
|
||||||
|
@ -94,7 +94,12 @@ public class WToolkit extends SunToolkit implements Runnable {
|
|||||||
public static void loadLibraries() {
|
public static void loadLibraries() {
|
||||||
if (!loaded) {
|
if (!loaded) {
|
||||||
java.security.AccessController.doPrivileged(
|
java.security.AccessController.doPrivileged(
|
||||||
new sun.security.action.LoadLibraryAction("awt"));
|
new java.security.PrivilegedAction<Void>() {
|
||||||
|
public Void run() {
|
||||||
|
System.loadLibrary("awt");
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
});
|
||||||
loaded = true;
|
loaded = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -56,8 +56,13 @@ public class FileSystemImpl extends FileSystem {
|
|||||||
// Initialization
|
// Initialization
|
||||||
|
|
||||||
static {
|
static {
|
||||||
java.security.AccessController
|
java.security.AccessController.doPrivileged(
|
||||||
.doPrivileged(new sun.security.action.LoadLibraryAction("management"));
|
new java.security.PrivilegedAction<Void>() {
|
||||||
|
public Void run() {
|
||||||
|
System.loadLibrary("management");
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
});
|
||||||
init0();
|
init0();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -161,7 +161,12 @@ public class ResolverConfigurationImpl
|
|||||||
|
|
||||||
static {
|
static {
|
||||||
java.security.AccessController.doPrivileged(
|
java.security.AccessController.doPrivileged(
|
||||||
new sun.security.action.LoadLibraryAction("net"));
|
new java.security.PrivilegedAction<Void>() {
|
||||||
|
public Void run() {
|
||||||
|
System.loadLibrary("net");
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
});
|
||||||
init0();
|
init0();
|
||||||
|
|
||||||
// start the address listener thread
|
// start the address listener thread
|
||||||
|
@ -56,7 +56,12 @@ public class Win32PrintServiceLookup extends PrintServiceLookup {
|
|||||||
|
|
||||||
static {
|
static {
|
||||||
java.security.AccessController.doPrivileged(
|
java.security.AccessController.doPrivileged(
|
||||||
new sun.security.action.LoadLibraryAction("awt"));
|
new java.security.PrivilegedAction<Void>() {
|
||||||
|
public Void run() {
|
||||||
|
System.loadLibrary("awt");
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
/* The singleton win32 print lookup service.
|
/* The singleton win32 print lookup service.
|
||||||
|
@ -26,8 +26,7 @@
|
|||||||
package sun.security.smartcardio;
|
package sun.security.smartcardio;
|
||||||
|
|
||||||
import java.security.AccessController;
|
import java.security.AccessController;
|
||||||
|
import java.security.PrivilegedAction;
|
||||||
import sun.security.action.LoadLibraryAction;
|
|
||||||
|
|
||||||
// Platform specific code and constants
|
// Platform specific code and constants
|
||||||
class PlatformPCSC {
|
class PlatformPCSC {
|
||||||
@ -44,7 +43,12 @@ class PlatformPCSC {
|
|||||||
|
|
||||||
private static Throwable loadLibrary() {
|
private static Throwable loadLibrary() {
|
||||||
try {
|
try {
|
||||||
AccessController.doPrivileged(new LoadLibraryAction("j2pcsc"));
|
AccessController.doPrivileged(new PrivilegedAction<Void>() {
|
||||||
|
public Void run() {
|
||||||
|
System.loadLibrary("j2pcsc");
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
});
|
||||||
return null;
|
return null;
|
||||||
} catch (Throwable e) {
|
} catch (Throwable e) {
|
||||||
return e;
|
return e;
|
||||||
|
@ -178,7 +178,7 @@ int enumInterfaces(JNIEnv *env, netif **netifPP)
|
|||||||
int count;
|
int count;
|
||||||
netif *netifP;
|
netif *netifP;
|
||||||
DWORD i;
|
DWORD i;
|
||||||
int lo=0, eth=0, tr=0, fddi=0, ppp=0, sl=0, net=0;
|
int lo=0, eth=0, tr=0, fddi=0, ppp=0, sl=0, wlan=0, net=0;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Ask the IP Helper library to enumerate the adapters
|
* Ask the IP Helper library to enumerate the adapters
|
||||||
@ -218,15 +218,15 @@ int enumInterfaces(JNIEnv *env, netif **netifPP)
|
|||||||
*/
|
*/
|
||||||
switch (ifrowP->dwType) {
|
switch (ifrowP->dwType) {
|
||||||
case MIB_IF_TYPE_ETHERNET:
|
case MIB_IF_TYPE_ETHERNET:
|
||||||
sprintf(dev_name, "eth%d", eth++);
|
_snprintf_s(dev_name, 8, _TRUNCATE, "eth%d", eth++);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case MIB_IF_TYPE_TOKENRING:
|
case MIB_IF_TYPE_TOKENRING:
|
||||||
sprintf(dev_name, "tr%d", tr++);
|
_snprintf_s(dev_name, 8, _TRUNCATE, "tr%d", tr++);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case MIB_IF_TYPE_FDDI:
|
case MIB_IF_TYPE_FDDI:
|
||||||
sprintf(dev_name, "fddi%d", fddi++);
|
_snprintf_s(dev_name, 8, _TRUNCATE, "fddi%d", fddi++);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case MIB_IF_TYPE_LOOPBACK:
|
case MIB_IF_TYPE_LOOPBACK:
|
||||||
@ -234,20 +234,24 @@ int enumInterfaces(JNIEnv *env, netif **netifPP)
|
|||||||
if (lo > 0) {
|
if (lo > 0) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
strcpy(dev_name, "lo");
|
strncpy_s(dev_name, 8, "lo", _TRUNCATE);
|
||||||
lo++;
|
lo++;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case MIB_IF_TYPE_PPP:
|
case MIB_IF_TYPE_PPP:
|
||||||
sprintf(dev_name, "ppp%d", ppp++);
|
_snprintf_s(dev_name, 8, _TRUNCATE, "ppp%d", ppp++);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case MIB_IF_TYPE_SLIP:
|
case MIB_IF_TYPE_SLIP:
|
||||||
sprintf(dev_name, "sl%d", sl++);
|
_snprintf_s(dev_name, 8, _TRUNCATE, "sl%d", sl++);
|
||||||
|
break;
|
||||||
|
|
||||||
|
case IF_TYPE_IEEE80211:
|
||||||
|
_snprintf_s(dev_name, 8, _TRUNCATE, "wlan%d", wlan++);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
sprintf(dev_name, "net%d", net++);
|
_snprintf_s(dev_name, 8, _TRUNCATE, "net%d", net++);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@ -382,6 +386,7 @@ int enumAddresses_win(JNIEnv *env, netif *netifP, netaddr **netaddrPP)
|
|||||||
case MIB_IF_TYPE_TOKENRING:
|
case MIB_IF_TYPE_TOKENRING:
|
||||||
case MIB_IF_TYPE_FDDI:
|
case MIB_IF_TYPE_FDDI:
|
||||||
case MIB_IF_TYPE_LOOPBACK:
|
case MIB_IF_TYPE_LOOPBACK:
|
||||||
|
case IF_TYPE_IEEE80211:
|
||||||
/**
|
/**
|
||||||
* Contrary to what it seems to indicate, dwBCastAddr doesn't
|
* Contrary to what it seems to indicate, dwBCastAddr doesn't
|
||||||
* contain the broadcast address but 0 or 1 depending on whether
|
* contain the broadcast address but 0 or 1 depending on whether
|
||||||
@ -928,6 +933,7 @@ JNIEXPORT jbyteArray JNICALL Java_java_net_NetworkInterface_getMacAddr0
|
|||||||
case MIB_IF_TYPE_ETHERNET:
|
case MIB_IF_TYPE_ETHERNET:
|
||||||
case MIB_IF_TYPE_TOKENRING:
|
case MIB_IF_TYPE_TOKENRING:
|
||||||
case MIB_IF_TYPE_FDDI:
|
case MIB_IF_TYPE_FDDI:
|
||||||
|
case IF_TYPE_IEEE80211:
|
||||||
len = ifRowP->dwPhysAddrLen;
|
len = ifRowP->dwPhysAddrLen;
|
||||||
ret = (*env)->NewByteArray(env, len);
|
ret = (*env)->NewByteArray(env, len);
|
||||||
if (!IS_NULL(ret)) {
|
if (!IS_NULL(ret)) {
|
||||||
|
@ -89,4 +89,9 @@ extern jfieldID ni_ibmaskID; /* InterfaceAddress.maskLength */
|
|||||||
|
|
||||||
int enumInterfaces(JNIEnv *env, netif **netifPP);
|
int enumInterfaces(JNIEnv *env, netif **netifPP);
|
||||||
|
|
||||||
|
// Windows Visa (and later) only.....
|
||||||
|
#ifndef IF_TYPE_IEEE80211
|
||||||
|
#define IF_TYPE_IEEE80211 71
|
||||||
|
#endif
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user