Merge
This commit is contained in:
J. Duke
commit
ed9d7cea7b
@ -274,3 +274,4 @@ ea2f7981236f3812436958748ab3d26e80a35130 jdk9-b28
|
||||
9e6581aeda388a23fbee021fc33e6aa152a60657 jdk9-b29
|
||||
36e9bc875325813ac9c44ac0c617a463091fa9f5 jdk9-b30
|
||||
69a84c16d9c28e0e3d504b9c8766c24bafcd58f6 jdk9-b31
|
||||
7e3512dae8e020d44399c0f1c579ff1fe3090ed6 jdk9-b32
|
||||
|
||||
@ -531,87 +531,87 @@ jdk/src/java.desktop/macosx/classes/sun/awt/resources/awtosx.properties : jdk/sr
|
||||
jdk/src/java.desktop/macosx/classes/sun/java2d/BackBufferCapsProvider.java : jdk/src/macosx/classes/sun/java2d/BackBufferCapsProvider.java
|
||||
jdk/src/java.desktop/macosx/conf/flavormap.properties : jdk/src/macosx/lib/flavormap.properties
|
||||
jdk/src/java.desktop/macosx/native/include/jawt_md.h : jdk/src/macosx/javavm/export/jawt_md.h
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/ApplicationDelegate.h : jdk/src/macosx/native/sun/awt/ApplicationDelegate.h
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/ApplicationDelegate.m : jdk/src/macosx/native/sun/awt/ApplicationDelegate.m
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/awt_DrawingSurface.m : jdk/src/macosx/native/sun/awt/awt_DrawingSurface.m
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/AWTEvent.h : jdk/src/macosx/native/sun/awt/AWTEvent.h
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/AWTEvent.m : jdk/src/macosx/native/sun/awt/AWTEvent.m
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/awt.m : jdk/src/macosx/native/sun/awt/awt.m
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/AWTSurfaceLayers.h : jdk/src/macosx/native/sun/awt/AWTSurfaceLayers.h
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/AWTSurfaceLayers.m : jdk/src/macosx/native/sun/awt/AWTSurfaceLayers.m
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/AWTView.h : jdk/src/macosx/native/sun/awt/AWTView.h
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/AWTView.m : jdk/src/macosx/native/sun/awt/AWTView.m
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/AWTWindow.h : jdk/src/macosx/native/sun/awt/AWTWindow.h
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/AWTWindow.m : jdk/src/macosx/native/sun/awt/AWTWindow.m
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CClipboard.m : jdk/src/macosx/native/sun/awt/CClipboard.m
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CCursorManager.m : jdk/src/macosx/native/sun/awt/CCursorManager.m
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CDataTransferer.h : jdk/src/macosx/native/sun/awt/CDataTransferer.h
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CDataTransferer.m : jdk/src/macosx/native/sun/awt/CDataTransferer.m
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CDesktopPeer.m : jdk/src/macosx/native/sun/awt/CDesktopPeer.m
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CDragSourceContextPeer.m : jdk/src/macosx/native/sun/awt/CDragSourceContextPeer.m
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CDragSource.h : jdk/src/macosx/native/sun/awt/CDragSource.h
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CDragSource.m : jdk/src/macosx/native/sun/awt/CDragSource.m
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CDropTargetContextPeer.m : jdk/src/macosx/native/sun/awt/CDropTargetContextPeer.m
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CDropTarget.h : jdk/src/macosx/native/sun/awt/CDropTarget.h
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CDropTarget.m : jdk/src/macosx/native/sun/awt/CDropTarget.m
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CFileDialog.h : jdk/src/macosx/native/sun/awt/CFileDialog.h
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CFileDialog.m : jdk/src/macosx/native/sun/awt/CFileDialog.m
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CFRetainedResource.m : jdk/src/macosx/native/sun/awt/CFRetainedResource.m
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CGraphicsConfig.m : jdk/src/macosx/native/sun/awt/CGraphicsConfig.m
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CGraphicsDevice.m : jdk/src/macosx/native/sun/awt/CGraphicsDevice.m
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CGraphicsEnv.m : jdk/src/macosx/native/sun/awt/CGraphicsEnv.m
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CImage.m : jdk/src/macosx/native/sun/awt/CImage.m
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CInputMethod.m : jdk/src/macosx/native/sun/awt/CInputMethod.m
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CMenuBar.h : jdk/src/macosx/native/sun/awt/CMenuBar.h
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CMenuBar.m : jdk/src/macosx/native/sun/awt/CMenuBar.m
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CMenuComponent.h : jdk/src/macosx/native/sun/awt/CMenuComponent.h
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CMenuComponent.m : jdk/src/macosx/native/sun/awt/CMenuComponent.m
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CMenu.h : jdk/src/macosx/native/sun/awt/CMenu.h
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CMenuItem.h : jdk/src/macosx/native/sun/awt/CMenuItem.h
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CMenuItem.m : jdk/src/macosx/native/sun/awt/CMenuItem.m
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CMenu.m : jdk/src/macosx/native/sun/awt/CMenu.m
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CPopupMenu.h : jdk/src/macosx/native/sun/awt/CPopupMenu.h
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CPopupMenu.m : jdk/src/macosx/native/sun/awt/CPopupMenu.m
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CPrinterJob.m : jdk/src/macosx/native/sun/awt/CPrinterJob.m
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CRobot.m : jdk/src/macosx/native/sun/awt/CRobot.m
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CSystemColors.h : jdk/src/macosx/native/sun/awt/CSystemColors.h
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CSystemColors.m : jdk/src/macosx/native/sun/awt/CSystemColors.m
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CTextPipe.m : jdk/src/macosx/native/sun/awt/CTextPipe.m
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CTrayIcon.h : jdk/src/macosx/native/sun/awt/CTrayIcon.h
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CTrayIcon.m : jdk/src/macosx/native/sun/awt/CTrayIcon.m
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/CWrapper.m : jdk/src/macosx/native/sun/awt/CWrapper.m
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/DnDUtilities.h : jdk/src/macosx/native/sun/awt/DnDUtilities.h
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/DnDUtilities.m : jdk/src/macosx/native/sun/awt/DnDUtilities.m
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/GeomUtilities.h : jdk/src/macosx/native/sun/awt/GeomUtilities.h
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/GeomUtilities.m : jdk/src/macosx/native/sun/awt/GeomUtilities.m
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/ImageSurfaceData.h : jdk/src/macosx/native/sun/awt/ImageSurfaceData.h
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/ImageSurfaceData.m : jdk/src/macosx/native/sun/awt/ImageSurfaceData.m
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/InitIDs.h : jdk/src/macosx/native/sun/awt/InitIDs.h
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/InitIDs.m : jdk/src/macosx/native/sun/awt/InitIDs.m
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/JavaAccessibilityAction.h : jdk/src/macosx/native/sun/awt/JavaAccessibilityAction.h
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/JavaAccessibilityAction.m : jdk/src/macosx/native/sun/awt/JavaAccessibilityAction.m
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/JavaAccessibilityUtilities.h : jdk/src/macosx/native/sun/awt/JavaAccessibilityUtilities.h
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/JavaAccessibilityUtilities.m : jdk/src/macosx/native/sun/awt/JavaAccessibilityUtilities.m
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/JavaComponentAccessibility.h : jdk/src/macosx/native/sun/awt/JavaComponentAccessibility.h
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/JavaComponentAccessibility.m : jdk/src/macosx/native/sun/awt/JavaComponentAccessibility.m
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/JavaTextAccessibility.h : jdk/src/macosx/native/sun/awt/JavaTextAccessibility.h
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/JavaTextAccessibility.m : jdk/src/macosx/native/sun/awt/JavaTextAccessibility.m
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/LWCToolkit.h : jdk/src/macosx/native/sun/awt/LWCToolkit.h
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/LWCToolkit.m : jdk/src/macosx/native/sun/awt/LWCToolkit.m
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/OSVersion.h : jdk/src/macosx/native/sun/awt/OSVersion.h
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/OSVersion.m : jdk/src/macosx/native/sun/awt/OSVersion.m
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/PrinterSurfaceData.h : jdk/src/macosx/native/sun/awt/PrinterSurfaceData.h
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/PrinterSurfaceData.m : jdk/src/macosx/native/sun/awt/PrinterSurfaceData.m
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/PrinterView.h : jdk/src/macosx/native/sun/awt/PrinterView.h
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/PrinterView.m : jdk/src/macosx/native/sun/awt/PrinterView.m
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/PrintModel.h : jdk/src/macosx/native/sun/awt/PrintModel.h
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/PrintModel.m : jdk/src/macosx/native/sun/awt/PrintModel.m
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/QuartzRenderer.m : jdk/src/macosx/native/sun/awt/QuartzRenderer.m
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/QuartzSurfaceData.h : jdk/src/macosx/native/sun/awt/QuartzSurfaceData.h
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/awt/QuartzSurfaceData.m : jdk/src/macosx/native/sun/awt/QuartzSurfaceData.m
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/font : jdk/src/macosx/native/sun/font
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/java2d/opengl/J2D_GL/cglext.h : jdk/src/macosx/native/sun/java2d/opengl/J2D_GL/cglext.h
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/sun/java2d/opengl : jdk/src/macosx/native/sun/java2d/opengl
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/ApplicationDelegate.h : jdk/src/macosx/native/sun/awt/ApplicationDelegate.h
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/ApplicationDelegate.m : jdk/src/macosx/native/sun/awt/ApplicationDelegate.m
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/awt_DrawingSurface.m : jdk/src/macosx/native/sun/awt/awt_DrawingSurface.m
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/AWTEvent.h : jdk/src/macosx/native/sun/awt/AWTEvent.h
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/AWTEvent.m : jdk/src/macosx/native/sun/awt/AWTEvent.m
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/awt.m : jdk/src/macosx/native/sun/awt/awt.m
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/AWTSurfaceLayers.h : jdk/src/macosx/native/sun/awt/AWTSurfaceLayers.h
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/AWTSurfaceLayers.m : jdk/src/macosx/native/sun/awt/AWTSurfaceLayers.m
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/AWTView.h : jdk/src/macosx/native/sun/awt/AWTView.h
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/AWTView.m : jdk/src/macosx/native/sun/awt/AWTView.m
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/AWTWindow.h : jdk/src/macosx/native/sun/awt/AWTWindow.h
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/AWTWindow.m : jdk/src/macosx/native/sun/awt/AWTWindow.m
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CClipboard.m : jdk/src/macosx/native/sun/awt/CClipboard.m
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CCursorManager.m : jdk/src/macosx/native/sun/awt/CCursorManager.m
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CDataTransferer.h : jdk/src/macosx/native/sun/awt/CDataTransferer.h
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CDataTransferer.m : jdk/src/macosx/native/sun/awt/CDataTransferer.m
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CDesktopPeer.m : jdk/src/macosx/native/sun/awt/CDesktopPeer.m
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CDragSourceContextPeer.m : jdk/src/macosx/native/sun/awt/CDragSourceContextPeer.m
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CDragSource.h : jdk/src/macosx/native/sun/awt/CDragSource.h
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CDragSource.m : jdk/src/macosx/native/sun/awt/CDragSource.m
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CDropTargetContextPeer.m : jdk/src/macosx/native/sun/awt/CDropTargetContextPeer.m
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CDropTarget.h : jdk/src/macosx/native/sun/awt/CDropTarget.h
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CDropTarget.m : jdk/src/macosx/native/sun/awt/CDropTarget.m
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CFileDialog.h : jdk/src/macosx/native/sun/awt/CFileDialog.h
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CFileDialog.m : jdk/src/macosx/native/sun/awt/CFileDialog.m
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CFRetainedResource.m : jdk/src/macosx/native/sun/awt/CFRetainedResource.m
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CGraphicsConfig.m : jdk/src/macosx/native/sun/awt/CGraphicsConfig.m
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CGraphicsDevice.m : jdk/src/macosx/native/sun/awt/CGraphicsDevice.m
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CGraphicsEnv.m : jdk/src/macosx/native/sun/awt/CGraphicsEnv.m
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CImage.m : jdk/src/macosx/native/sun/awt/CImage.m
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CInputMethod.m : jdk/src/macosx/native/sun/awt/CInputMethod.m
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CMenuBar.h : jdk/src/macosx/native/sun/awt/CMenuBar.h
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CMenuBar.m : jdk/src/macosx/native/sun/awt/CMenuBar.m
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CMenuComponent.h : jdk/src/macosx/native/sun/awt/CMenuComponent.h
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CMenuComponent.m : jdk/src/macosx/native/sun/awt/CMenuComponent.m
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CMenu.h : jdk/src/macosx/native/sun/awt/CMenu.h
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CMenuItem.h : jdk/src/macosx/native/sun/awt/CMenuItem.h
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CMenuItem.m : jdk/src/macosx/native/sun/awt/CMenuItem.m
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CMenu.m : jdk/src/macosx/native/sun/awt/CMenu.m
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CPopupMenu.h : jdk/src/macosx/native/sun/awt/CPopupMenu.h
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CPopupMenu.m : jdk/src/macosx/native/sun/awt/CPopupMenu.m
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CPrinterJob.m : jdk/src/macosx/native/sun/awt/CPrinterJob.m
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CRobot.m : jdk/src/macosx/native/sun/awt/CRobot.m
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CSystemColors.h : jdk/src/macosx/native/sun/awt/CSystemColors.h
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CSystemColors.m : jdk/src/macosx/native/sun/awt/CSystemColors.m
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CTextPipe.m : jdk/src/macosx/native/sun/awt/CTextPipe.m
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CTrayIcon.h : jdk/src/macosx/native/sun/awt/CTrayIcon.h
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CTrayIcon.m : jdk/src/macosx/native/sun/awt/CTrayIcon.m
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CWrapper.m : jdk/src/macosx/native/sun/awt/CWrapper.m
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/DnDUtilities.h : jdk/src/macosx/native/sun/awt/DnDUtilities.h
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/DnDUtilities.m : jdk/src/macosx/native/sun/awt/DnDUtilities.m
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/GeomUtilities.h : jdk/src/macosx/native/sun/awt/GeomUtilities.h
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/GeomUtilities.m : jdk/src/macosx/native/sun/awt/GeomUtilities.m
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/ImageSurfaceData.h : jdk/src/macosx/native/sun/awt/ImageSurfaceData.h
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/ImageSurfaceData.m : jdk/src/macosx/native/sun/awt/ImageSurfaceData.m
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/InitIDs.h : jdk/src/macosx/native/sun/awt/InitIDs.h
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/InitIDs.m : jdk/src/macosx/native/sun/awt/InitIDs.m
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/JavaAccessibilityAction.h : jdk/src/macosx/native/sun/awt/JavaAccessibilityAction.h
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/JavaAccessibilityAction.m : jdk/src/macosx/native/sun/awt/JavaAccessibilityAction.m
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/JavaAccessibilityUtilities.h : jdk/src/macosx/native/sun/awt/JavaAccessibilityUtilities.h
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/JavaAccessibilityUtilities.m : jdk/src/macosx/native/sun/awt/JavaAccessibilityUtilities.m
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/JavaComponentAccessibility.h : jdk/src/macosx/native/sun/awt/JavaComponentAccessibility.h
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/JavaComponentAccessibility.m : jdk/src/macosx/native/sun/awt/JavaComponentAccessibility.m
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/JavaTextAccessibility.h : jdk/src/macosx/native/sun/awt/JavaTextAccessibility.h
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/JavaTextAccessibility.m : jdk/src/macosx/native/sun/awt/JavaTextAccessibility.m
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/LWCToolkit.h : jdk/src/macosx/native/sun/awt/LWCToolkit.h
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/LWCToolkit.m : jdk/src/macosx/native/sun/awt/LWCToolkit.m
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/OSVersion.h : jdk/src/macosx/native/sun/awt/OSVersion.h
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/OSVersion.m : jdk/src/macosx/native/sun/awt/OSVersion.m
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/PrinterSurfaceData.h : jdk/src/macosx/native/sun/awt/PrinterSurfaceData.h
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/PrinterSurfaceData.m : jdk/src/macosx/native/sun/awt/PrinterSurfaceData.m
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/PrinterView.h : jdk/src/macosx/native/sun/awt/PrinterView.h
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/PrinterView.m : jdk/src/macosx/native/sun/awt/PrinterView.m
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/PrintModel.h : jdk/src/macosx/native/sun/awt/PrintModel.h
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/PrintModel.m : jdk/src/macosx/native/sun/awt/PrintModel.m
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/QuartzRenderer.m : jdk/src/macosx/native/sun/awt/QuartzRenderer.m
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/QuartzSurfaceData.h : jdk/src/macosx/native/sun/awt/QuartzSurfaceData.h
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/QuartzSurfaceData.m : jdk/src/macosx/native/sun/awt/QuartzSurfaceData.m
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/font : jdk/src/macosx/native/sun/font
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/java2d/opengl/J2D_GL/cglext.h : jdk/src/macosx/native/sun/java2d/opengl/J2D_GL/cglext.h
|
||||
jdk/src/java.desktop/macosx/native/libawt_lwawt/java2d/opengl : jdk/src/macosx/native/sun/java2d/opengl
|
||||
jdk/src/java.desktop/macosx/native/libjawt/jawt.m : jdk/src/macosx/native/sun/awt/jawt.m
|
||||
jdk/src/java.desktop/macosx/native/libjsound : jdk/src/macosx/native/com/sun/media/sound
|
||||
jdk/src/java.desktop/macosx/native/libosxapp : jdk/src/macosx/native/sun/osxapp
|
||||
@ -686,26 +686,26 @@ jdk/src/java.desktop/share/conf/images/cursors : jdk/src/share/lib/images/cursor
|
||||
jdk/src/java.desktop/share/conf/psfontj2d.properties : jdk/src/share/classes/sun/print/psfontj2d.properties
|
||||
jdk/src/java.desktop/share/conf/psfont.properties.ja : jdk/src/share/classes/sun/print/psfont.properties.ja
|
||||
jdk/src/java.desktop/share/conf/sound.properties : jdk/src/share/lib/sound.properties
|
||||
jdk/src/java.desktop/share/native/common/sun/awt/debug : jdk/src/share/native/sun/awt/debug
|
||||
jdk/src/java.desktop/share/native/common/sun/awt/medialib/mlib_ImageCopy_Bit.c : jdk/src/share/native/sun/awt/medialib/mlib_ImageCopy_Bit.c
|
||||
jdk/src/java.desktop/share/native/common/sun/awt/medialib/mlib_ImageCreate.c : jdk/src/share/native/sun/awt/medialib/mlib_ImageCreate.c
|
||||
jdk/src/java.desktop/share/native/common/sun/awt/medialib/mlib_sys.c : jdk/src/share/native/sun/awt/medialib/mlib_sys.c
|
||||
jdk/src/java.desktop/share/native/common/sun/awt/utility/rect.c : jdk/src/share/native/sun/awt/utility/rect.c
|
||||
jdk/src/java.desktop/share/native/common/sun/font/AccelGlyphCache.c : jdk/src/share/native/sun/font/AccelGlyphCache.c
|
||||
jdk/src/java.desktop/share/native/common/sun/font/AccelGlyphCache.h : jdk/src/share/native/sun/font/AccelGlyphCache.h
|
||||
jdk/src/java.desktop/share/native/common/sun/font/fontscalerdefs.h : jdk/src/share/native/sun/font/fontscalerdefs.h
|
||||
jdk/src/java.desktop/share/native/common/sun/font/sunfontids.h : jdk/src/share/native/sun/font/sunfontids.h
|
||||
jdk/src/java.desktop/share/native/common/sun/java2d/opengl/J2D_GL : jdk/src/share/native/sun/java2d/opengl/J2D_GL
|
||||
jdk/src/java.desktop/share/native/common/sun/java2d/opengl : jdk/src/share/native/sun/java2d/opengl
|
||||
jdk/src/java.desktop/share/native/common/awt/debug : jdk/src/share/native/sun/awt/debug
|
||||
jdk/src/java.desktop/share/native/common/awt/medialib/mlib_ImageCopy_Bit.c : jdk/src/share/native/sun/awt/medialib/mlib_ImageCopy_Bit.c
|
||||
jdk/src/java.desktop/share/native/common/awt/medialib/mlib_ImageCreate.c : jdk/src/share/native/sun/awt/medialib/mlib_ImageCreate.c
|
||||
jdk/src/java.desktop/share/native/common/awt/medialib/mlib_sys.c : jdk/src/share/native/sun/awt/medialib/mlib_sys.c
|
||||
jdk/src/java.desktop/share/native/common/awt/utility/rect.c : jdk/src/share/native/sun/awt/utility/rect.c
|
||||
jdk/src/java.desktop/share/native/common/font/AccelGlyphCache.c : jdk/src/share/native/sun/font/AccelGlyphCache.c
|
||||
jdk/src/java.desktop/share/native/common/font/AccelGlyphCache.h : jdk/src/share/native/sun/font/AccelGlyphCache.h
|
||||
jdk/src/java.desktop/share/native/common/font/fontscalerdefs.h : jdk/src/share/native/sun/font/fontscalerdefs.h
|
||||
jdk/src/java.desktop/share/native/common/font/sunfontids.h : jdk/src/share/native/sun/font/sunfontids.h
|
||||
jdk/src/java.desktop/share/native/common/java2d/opengl/J2D_GL : jdk/src/share/native/sun/java2d/opengl/J2D_GL
|
||||
jdk/src/java.desktop/share/native/common/java2d/opengl : jdk/src/share/native/sun/java2d/opengl
|
||||
jdk/src/java.desktop/share/native/include/jawt.h : jdk/src/share/javavm/export/jawt.h
|
||||
jdk/src/java.desktop/share/native/libawt/sun/awt/image/cvutils : jdk/src/share/native/sun/awt/image/cvutils
|
||||
jdk/src/java.desktop/share/native/libawt/sun/awt/image/gif/gifdecoder.c : jdk/src/share/native/sun/awt/image/gif/gifdecoder.c
|
||||
jdk/src/java.desktop/share/native/libawt/sun/awt/image : jdk/src/share/native/sun/awt/image
|
||||
jdk/src/java.desktop/share/native/libawt/sun/awt/medialib/awt_ImagingLib.c : jdk/src/share/native/sun/awt/medialib/awt_ImagingLib.c
|
||||
jdk/src/java.desktop/share/native/libawt/sun/awt/medialib/awt_ImagingLib.h : jdk/src/share/native/sun/awt/medialib/awt_ImagingLib.h
|
||||
jdk/src/java.desktop/share/native/libawt/sun/java2d : jdk/src/share/native/sun/java2d
|
||||
jdk/src/java.desktop/share/native/libawt/sun/java2d/loops : jdk/src/share/native/sun/java2d/loops
|
||||
jdk/src/java.desktop/share/native/libawt/sun/java2d/pipe : jdk/src/share/native/sun/java2d/pipe
|
||||
jdk/src/java.desktop/share/native/libawt/awt/image/cvutils : jdk/src/share/native/sun/awt/image/cvutils
|
||||
jdk/src/java.desktop/share/native/libawt/awt/image/gif/gifdecoder.c : jdk/src/share/native/sun/awt/image/gif/gifdecoder.c
|
||||
jdk/src/java.desktop/share/native/libawt/awt/image : jdk/src/share/native/sun/awt/image
|
||||
jdk/src/java.desktop/share/native/libawt/awt/medialib/awt_ImagingLib.c : jdk/src/share/native/sun/awt/medialib/awt_ImagingLib.c
|
||||
jdk/src/java.desktop/share/native/libawt/awt/medialib/awt_ImagingLib.h : jdk/src/share/native/sun/awt/medialib/awt_ImagingLib.h
|
||||
jdk/src/java.desktop/share/native/libawt/java2d : jdk/src/share/native/sun/java2d
|
||||
jdk/src/java.desktop/share/native/libawt/java2d/loops : jdk/src/share/native/sun/java2d/loops
|
||||
jdk/src/java.desktop/share/native/libawt/java2d/pipe : jdk/src/share/native/sun/java2d/pipe
|
||||
jdk/src/java.desktop/share/native/libfontmanager/DrawGlyphList.c : jdk/src/share/native/sun/font/DrawGlyphList.c
|
||||
jdk/src/java.desktop/share/native/libfontmanager/FontInstanceAdapter.cpp : jdk/src/share/native/sun/font/FontInstanceAdapter.cpp
|
||||
jdk/src/java.desktop/share/native/libfontmanager/FontInstanceAdapter.h : jdk/src/share/native/sun/font/FontInstanceAdapter.h
|
||||
@ -833,80 +833,80 @@ jdk/src/java.desktop/unix/classes/sun/print : jdk/src/solaris/classes/sun/print
|
||||
jdk/src/java.desktop/unix/conf/flavormap.properties : jdk/src/solaris/lib/flavormap.properties
|
||||
jdk/src/java.desktop/unix/conf/fonts/fonts.dir : jdk/src/solaris/classes/sun/awt/motif/java.fonts.dir
|
||||
jdk/src/java.desktop/unix/conf/images/cursors/cursors.properties : jdk/src/solaris/lib/images/cursors/cursors.properties
|
||||
jdk/src/java.desktop/unix/native/common/sun/awt/awt_Component.h : jdk/src/solaris/native/sun/awt/awt_Component.h
|
||||
jdk/src/java.desktop/unix/native/common/sun/awt/awt_DrawingSurface.h : jdk/src/solaris/native/sun/awt/awt_DrawingSurface.h
|
||||
jdk/src/java.desktop/unix/native/common/sun/awt/awt_Font.c : jdk/src/solaris/native/sun/awt/awt_Font.c
|
||||
jdk/src/java.desktop/unix/native/common/sun/awt/awt_Font.h : jdk/src/solaris/native/sun/awt/awt_Font.h
|
||||
jdk/src/java.desktop/unix/native/common/sun/awt/awt_GraphicsEnv.h : jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.h
|
||||
jdk/src/java.desktop/unix/native/common/sun/awt/awt.h : jdk/src/solaris/native/sun/awt/awt.h
|
||||
jdk/src/java.desktop/unix/native/common/sun/awt/awt_Mlib.h : jdk/src/solaris/native/sun/awt/awt_Mlib.h
|
||||
jdk/src/java.desktop/unix/native/common/sun/awt/awt_p.h : jdk/src/solaris/native/sun/awt/awt_p.h
|
||||
jdk/src/java.desktop/unix/native/common/sun/awt/awt_util.h : jdk/src/solaris/native/sun/awt/awt_util.h
|
||||
jdk/src/java.desktop/unix/native/common/sun/awt/colordata.h : jdk/src/solaris/native/sun/awt/colordata.h
|
||||
jdk/src/java.desktop/unix/native/common/sun/awt/color.h : jdk/src/solaris/native/sun/awt/color.h
|
||||
jdk/src/java.desktop/unix/native/common/sun/awt/CUPSfuncs.c : jdk/src/solaris/native/sun/awt/CUPSfuncs.c
|
||||
jdk/src/java.desktop/unix/native/common/sun/awt/fontconfig.h : jdk/src/solaris/native/sun/awt/fontconfig.h
|
||||
jdk/src/java.desktop/unix/native/common/sun/awt/fontpath.c : jdk/src/solaris/native/sun/awt/fontpath.c
|
||||
jdk/src/java.desktop/unix/native/common/sun/awt/img_util_md.h : jdk/src/solaris/native/sun/awt/img_util_md.h
|
||||
jdk/src/java.desktop/unix/native/common/sun/awt/initIDs.c : jdk/src/solaris/native/sun/awt/initIDs.c
|
||||
jdk/src/java.desktop/unix/native/common/sun/awt/medialib/mlib_v_ImageCopy_f.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageCopy_f.c
|
||||
jdk/src/java.desktop/unix/native/common/sun/awt/medialib/mlib_v_ImageCopy_f.h : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageCopy_f.h
|
||||
jdk/src/java.desktop/unix/native/common/sun/awt/medialib/vis_proto.h : jdk/src/solaris/native/sun/awt/medialib/vis_proto.h
|
||||
jdk/src/java.desktop/unix/native/common/sun/awt/utility/rect.h : jdk/src/solaris/native/sun/awt/utility/rect.h
|
||||
jdk/src/java.desktop/unix/native/common/sun/awt/X11Color.c : jdk/src/solaris/native/sun/awt/X11Color.c
|
||||
jdk/src/java.desktop/unix/native/common/sun/font/X11FontScaler.h : jdk/src/solaris/native/sun/font/X11FontScaler.h
|
||||
jdk/src/java.desktop/unix/native/common/sun/java2d/opengl/J2D_GL : jdk/src/solaris/native/sun/java2d/opengl/J2D_GL
|
||||
jdk/src/java.desktop/unix/native/common/sun/java2d/opengl : jdk/src/solaris/native/sun/java2d/opengl
|
||||
jdk/src/java.desktop/unix/native/common/sun/java2d/x11/X11FontScaler_md.c : jdk/src/solaris/native/sun/java2d/x11/X11FontScaler_md.c
|
||||
jdk/src/java.desktop/unix/native/common/sun/java2d/x11/X11PMBlitLoops.c : jdk/src/solaris/native/sun/java2d/x11/X11PMBlitLoops.c
|
||||
jdk/src/java.desktop/unix/native/common/sun/java2d/x11/X11Renderer.c : jdk/src/solaris/native/sun/java2d/x11/X11Renderer.c
|
||||
jdk/src/java.desktop/unix/native/common/sun/java2d/x11/X11SurfaceData.c : jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.c
|
||||
jdk/src/java.desktop/unix/native/common/sun/java2d/x11/X11SurfaceData.h : jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.h
|
||||
jdk/src/java.desktop/unix/native/common/sun/java2d/x11/X11TextRenderer_md.c : jdk/src/solaris/native/sun/java2d/x11/X11TextRenderer_md.c
|
||||
jdk/src/java.desktop/unix/native/common/awt/awt_Component.h : jdk/src/solaris/native/sun/awt/awt_Component.h
|
||||
jdk/src/java.desktop/unix/native/common/awt/awt_DrawingSurface.h : jdk/src/solaris/native/sun/awt/awt_DrawingSurface.h
|
||||
jdk/src/java.desktop/unix/native/common/awt/awt_Font.c : jdk/src/solaris/native/sun/awt/awt_Font.c
|
||||
jdk/src/java.desktop/unix/native/common/awt/awt_Font.h : jdk/src/solaris/native/sun/awt/awt_Font.h
|
||||
jdk/src/java.desktop/unix/native/common/awt/awt_GraphicsEnv.h : jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.h
|
||||
jdk/src/java.desktop/unix/native/common/awt/awt.h : jdk/src/solaris/native/sun/awt/awt.h
|
||||
jdk/src/java.desktop/unix/native/common/awt/awt_Mlib.h : jdk/src/solaris/native/sun/awt/awt_Mlib.h
|
||||
jdk/src/java.desktop/unix/native/common/awt/awt_p.h : jdk/src/solaris/native/sun/awt/awt_p.h
|
||||
jdk/src/java.desktop/unix/native/common/awt/awt_util.h : jdk/src/solaris/native/sun/awt/awt_util.h
|
||||
jdk/src/java.desktop/unix/native/common/awt/colordata.h : jdk/src/solaris/native/sun/awt/colordata.h
|
||||
jdk/src/java.desktop/unix/native/common/awt/color.h : jdk/src/solaris/native/sun/awt/color.h
|
||||
jdk/src/java.desktop/unix/native/common/awt/CUPSfuncs.c : jdk/src/solaris/native/sun/awt/CUPSfuncs.c
|
||||
jdk/src/java.desktop/unix/native/common/awt/fontconfig.h : jdk/src/solaris/native/sun/awt/fontconfig.h
|
||||
jdk/src/java.desktop/unix/native/common/awt/fontpath.c : jdk/src/solaris/native/sun/awt/fontpath.c
|
||||
jdk/src/java.desktop/unix/native/common/awt/img_util_md.h : jdk/src/solaris/native/sun/awt/img_util_md.h
|
||||
jdk/src/java.desktop/unix/native/common/awt/initIDs.c : jdk/src/solaris/native/sun/awt/initIDs.c
|
||||
jdk/src/java.desktop/unix/native/common/awt/medialib/mlib_v_ImageCopy_f.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageCopy_f.c
|
||||
jdk/src/java.desktop/unix/native/common/awt/medialib/mlib_v_ImageCopy_f.h : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageCopy_f.h
|
||||
jdk/src/java.desktop/unix/native/common/awt/medialib/vis_proto.h : jdk/src/solaris/native/sun/awt/medialib/vis_proto.h
|
||||
jdk/src/java.desktop/unix/native/common/awt/utility/rect.h : jdk/src/solaris/native/sun/awt/utility/rect.h
|
||||
jdk/src/java.desktop/unix/native/common/awt/X11Color.c : jdk/src/solaris/native/sun/awt/X11Color.c
|
||||
jdk/src/java.desktop/unix/native/common/font/X11FontScaler.h : jdk/src/solaris/native/sun/font/X11FontScaler.h
|
||||
jdk/src/java.desktop/unix/native/common/java2d/opengl/J2D_GL : jdk/src/solaris/native/sun/java2d/opengl/J2D_GL
|
||||
jdk/src/java.desktop/unix/native/common/java2d/opengl : jdk/src/solaris/native/sun/java2d/opengl
|
||||
jdk/src/java.desktop/unix/native/common/java2d/x11/X11FontScaler_md.c : jdk/src/solaris/native/sun/java2d/x11/X11FontScaler_md.c
|
||||
jdk/src/java.desktop/unix/native/common/java2d/x11/X11PMBlitLoops.c : jdk/src/solaris/native/sun/java2d/x11/X11PMBlitLoops.c
|
||||
jdk/src/java.desktop/unix/native/common/java2d/x11/X11Renderer.c : jdk/src/solaris/native/sun/java2d/x11/X11Renderer.c
|
||||
jdk/src/java.desktop/unix/native/common/java2d/x11/X11SurfaceData.c : jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.c
|
||||
jdk/src/java.desktop/unix/native/common/java2d/x11/X11SurfaceData.h : jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.h
|
||||
jdk/src/java.desktop/unix/native/common/java2d/x11/X11TextRenderer_md.c : jdk/src/solaris/native/sun/java2d/x11/X11TextRenderer_md.c
|
||||
jdk/src/java.desktop/unix/native/include/jawt_md.h : jdk/src/solaris/javavm/export/jawt_md.h
|
||||
jdk/src/java.desktop/unix/native/libawt_headless/sun/awt/HeadlessToolkit.c : jdk/src/solaris/native/sun/awt/HeadlessToolkit.c
|
||||
jdk/src/java.desktop/unix/native/libawt_headless/sun/awt/VDrawingArea.c : jdk/src/solaris/native/sun/awt/VDrawingArea.c
|
||||
jdk/src/java.desktop/unix/native/libawt/sun/awt/awt_LoadLibrary.c : jdk/src/solaris/native/sun/awt/awt_LoadLibrary.c
|
||||
jdk/src/java.desktop/unix/native/libawt/sun/awt/awt_Mlib.c : jdk/src/solaris/native/sun/awt/awt_Mlib.c
|
||||
jdk/src/java.desktop/unix/native/libawt/sun/awt/medialib/mlib_v_ImageCopy_blk.s : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageCopy_blk.s
|
||||
jdk/src/java.desktop/unix/native/libawt/sun/awt/medialib/mlib_v_ImageCopy.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageCopy.c
|
||||
jdk/src/java.desktop/unix/native/libawt/sun/awt/medialib/vis_asi.h : jdk/src/solaris/native/sun/awt/medialib/vis_asi.h
|
||||
jdk/src/java.desktop/unix/native/libawt/sun/java2d/j2d_md.h : jdk/src/solaris/native/sun/java2d/j2d_md.h
|
||||
jdk/src/java.desktop/unix/native/libawt/sun/java2d/loops : jdk/src/solaris/native/sun/java2d/loops
|
||||
jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/awt_AWTEvent.c : jdk/src/solaris/native/sun/awt/awt_AWTEvent.c
|
||||
jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/awt_AWTEvent.h : jdk/src/solaris/native/sun/awt/awt_AWTEvent.h
|
||||
jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/awt_DrawingSurface.c : jdk/src/solaris/native/sun/awt/awt_DrawingSurface.c
|
||||
jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/awt_Event.c : jdk/src/solaris/native/sun/awt/awt_Event.c
|
||||
jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/awt_Event.h : jdk/src/solaris/native/sun/awt/awt_Event.h
|
||||
jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/awt_GraphicsEnv.c : jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c
|
||||
jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/awt_InputMethod.c : jdk/src/solaris/native/sun/awt/awt_InputMethod.c
|
||||
jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/awt_Insets.c : jdk/src/solaris/native/sun/awt/awt_Insets.c
|
||||
jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/awt_Insets.h : jdk/src/solaris/native/sun/awt/awt_Insets.h
|
||||
jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/awt_MenuComponent.h : jdk/src/solaris/native/sun/awt/awt_MenuComponent.h
|
||||
jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/awt_Robot.c : jdk/src/solaris/native/sun/awt/awt_Robot.c
|
||||
jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/awt_UNIXToolkit.c : jdk/src/solaris/native/sun/awt/awt_UNIXToolkit.c
|
||||
jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/awt_util.c : jdk/src/solaris/native/sun/awt/awt_util.c
|
||||
jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/canvas.h : jdk/src/solaris/native/sun/awt/canvas.h
|
||||
jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/gtk2_interface.c : jdk/src/solaris/native/sun/awt/gtk2_interface.c
|
||||
jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/gtk2_interface.h : jdk/src/solaris/native/sun/awt/gtk2_interface.h
|
||||
jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/HPkeysym.h : jdk/src/solaris/native/sun/awt/HPkeysym.h
|
||||
jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/list.c : jdk/src/solaris/native/sun/awt/list.c
|
||||
jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/list.h : jdk/src/solaris/native/sun/awt/list.h
|
||||
jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/multi_font.c : jdk/src/solaris/native/sun/awt/multi_font.c
|
||||
jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/multi_font.h : jdk/src/solaris/native/sun/awt/multi_font.h
|
||||
jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/multiVis.c : jdk/src/solaris/native/sun/awt/multiVis.c
|
||||
jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/multiVis.h : jdk/src/solaris/native/sun/awt/multiVis.h
|
||||
jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/randr.h : jdk/src/solaris/native/sun/awt/randr.h
|
||||
jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/robot_common.c : jdk/src/solaris/native/sun/awt/robot_common.c
|
||||
jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/robot_common.h : jdk/src/solaris/native/sun/awt/robot_common.h
|
||||
jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/sun_awt_X11_GtkFileDialogPeer.c : jdk/src/solaris/native/sun/awt/sun_awt_X11_GtkFileDialogPeer.c
|
||||
jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/swing_GTKEngine.c : jdk/src/solaris/native/sun/awt/swing_GTKEngine.c
|
||||
jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/swing_GTKStyle.c : jdk/src/solaris/native/sun/awt/swing_GTKStyle.c
|
||||
jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/wsutils.h : jdk/src/solaris/native/sun/awt/wsutils.h
|
||||
jdk/src/java.desktop/unix/native/libawt_xawt/sun/awt/Xrandr.h : jdk/src/solaris/native/sun/awt/Xrandr.h
|
||||
jdk/src/java.desktop/unix/native/libawt_xawt/sun/java2d/x11/XRBackendNative.c : jdk/src/solaris/native/sun/java2d/x11/XRBackendNative.c
|
||||
jdk/src/java.desktop/unix/native/libawt_xawt/sun/java2d/x11/XRSurfaceData.c : jdk/src/solaris/native/sun/java2d/x11/XRSurfaceData.c
|
||||
jdk/src/java.desktop/unix/native/libawt_xawt/sun/xawt : jdk/src/solaris/native/sun/xawt
|
||||
jdk/src/java.desktop/unix/native/libawt_headless/awt/HeadlessToolkit.c : jdk/src/solaris/native/sun/awt/HeadlessToolkit.c
|
||||
jdk/src/java.desktop/unix/native/libawt_headless/awt/VDrawingArea.c : jdk/src/solaris/native/sun/awt/VDrawingArea.c
|
||||
jdk/src/java.desktop/unix/native/libawt/awt/awt_LoadLibrary.c : jdk/src/solaris/native/sun/awt/awt_LoadLibrary.c
|
||||
jdk/src/java.desktop/unix/native/libawt/awt/awt_Mlib.c : jdk/src/solaris/native/sun/awt/awt_Mlib.c
|
||||
jdk/src/java.desktop/unix/native/libawt/awt/medialib/mlib_v_ImageCopy_blk.s : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageCopy_blk.s
|
||||
jdk/src/java.desktop/unix/native/libawt/awt/medialib/mlib_v_ImageCopy.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageCopy.c
|
||||
jdk/src/java.desktop/unix/native/libawt/awt/medialib/vis_asi.h : jdk/src/solaris/native/sun/awt/medialib/vis_asi.h
|
||||
jdk/src/java.desktop/unix/native/libawt/java2d/j2d_md.h : jdk/src/solaris/native/sun/java2d/j2d_md.h
|
||||
jdk/src/java.desktop/unix/native/libawt/java2d/loops : jdk/src/solaris/native/sun/java2d/loops
|
||||
jdk/src/java.desktop/unix/native/libawt_xawt/awt/awt_AWTEvent.c : jdk/src/solaris/native/sun/awt/awt_AWTEvent.c
|
||||
jdk/src/java.desktop/unix/native/libawt_xawt/awt/awt_AWTEvent.h : jdk/src/solaris/native/sun/awt/awt_AWTEvent.h
|
||||
jdk/src/java.desktop/unix/native/libawt_xawt/awt/awt_DrawingSurface.c : jdk/src/solaris/native/sun/awt/awt_DrawingSurface.c
|
||||
jdk/src/java.desktop/unix/native/libawt_xawt/awt/awt_Event.c : jdk/src/solaris/native/sun/awt/awt_Event.c
|
||||
jdk/src/java.desktop/unix/native/libawt_xawt/awt/awt_Event.h : jdk/src/solaris/native/sun/awt/awt_Event.h
|
||||
jdk/src/java.desktop/unix/native/libawt_xawt/awt/awt_GraphicsEnv.c : jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c
|
||||
jdk/src/java.desktop/unix/native/libawt_xawt/awt/awt_InputMethod.c : jdk/src/solaris/native/sun/awt/awt_InputMethod.c
|
||||
jdk/src/java.desktop/unix/native/libawt_xawt/awt/awt_Insets.c : jdk/src/solaris/native/sun/awt/awt_Insets.c
|
||||
jdk/src/java.desktop/unix/native/libawt_xawt/awt/awt_Insets.h : jdk/src/solaris/native/sun/awt/awt_Insets.h
|
||||
jdk/src/java.desktop/unix/native/libawt_xawt/awt/awt_MenuComponent.h : jdk/src/solaris/native/sun/awt/awt_MenuComponent.h
|
||||
jdk/src/java.desktop/unix/native/libawt_xawt/awt/awt_Robot.c : jdk/src/solaris/native/sun/awt/awt_Robot.c
|
||||
jdk/src/java.desktop/unix/native/libawt_xawt/awt/awt_UNIXToolkit.c : jdk/src/solaris/native/sun/awt/awt_UNIXToolkit.c
|
||||
jdk/src/java.desktop/unix/native/libawt_xawt/awt/awt_util.c : jdk/src/solaris/native/sun/awt/awt_util.c
|
||||
jdk/src/java.desktop/unix/native/libawt_xawt/awt/canvas.h : jdk/src/solaris/native/sun/awt/canvas.h
|
||||
jdk/src/java.desktop/unix/native/libawt_xawt/awt/gtk2_interface.c : jdk/src/solaris/native/sun/awt/gtk2_interface.c
|
||||
jdk/src/java.desktop/unix/native/libawt_xawt/awt/gtk2_interface.h : jdk/src/solaris/native/sun/awt/gtk2_interface.h
|
||||
jdk/src/java.desktop/unix/native/libawt_xawt/awt/HPkeysym.h : jdk/src/solaris/native/sun/awt/HPkeysym.h
|
||||
jdk/src/java.desktop/unix/native/libawt_xawt/awt/list.c : jdk/src/solaris/native/sun/awt/list.c
|
||||
jdk/src/java.desktop/unix/native/libawt_xawt/awt/list.h : jdk/src/solaris/native/sun/awt/list.h
|
||||
jdk/src/java.desktop/unix/native/libawt_xawt/awt/multi_font.c : jdk/src/solaris/native/sun/awt/multi_font.c
|
||||
jdk/src/java.desktop/unix/native/libawt_xawt/awt/multi_font.h : jdk/src/solaris/native/sun/awt/multi_font.h
|
||||
jdk/src/java.desktop/unix/native/libawt_xawt/awt/multiVis.c : jdk/src/solaris/native/sun/awt/multiVis.c
|
||||
jdk/src/java.desktop/unix/native/libawt_xawt/awt/multiVis.h : jdk/src/solaris/native/sun/awt/multiVis.h
|
||||
jdk/src/java.desktop/unix/native/libawt_xawt/awt/randr.h : jdk/src/solaris/native/sun/awt/randr.h
|
||||
jdk/src/java.desktop/unix/native/libawt_xawt/awt/robot_common.c : jdk/src/solaris/native/sun/awt/robot_common.c
|
||||
jdk/src/java.desktop/unix/native/libawt_xawt/awt/robot_common.h : jdk/src/solaris/native/sun/awt/robot_common.h
|
||||
jdk/src/java.desktop/unix/native/libawt_xawt/awt/sun_awt_X11_GtkFileDialogPeer.c : jdk/src/solaris/native/sun/awt/sun_awt_X11_GtkFileDialogPeer.c
|
||||
jdk/src/java.desktop/unix/native/libawt_xawt/awt/swing_GTKEngine.c : jdk/src/solaris/native/sun/awt/swing_GTKEngine.c
|
||||
jdk/src/java.desktop/unix/native/libawt_xawt/awt/swing_GTKStyle.c : jdk/src/solaris/native/sun/awt/swing_GTKStyle.c
|
||||
jdk/src/java.desktop/unix/native/libawt_xawt/awt/wsutils.h : jdk/src/solaris/native/sun/awt/wsutils.h
|
||||
jdk/src/java.desktop/unix/native/libawt_xawt/awt/Xrandr.h : jdk/src/solaris/native/sun/awt/Xrandr.h
|
||||
jdk/src/java.desktop/unix/native/libawt_xawt/java2d/x11/XRBackendNative.c : jdk/src/solaris/native/sun/java2d/x11/XRBackendNative.c
|
||||
jdk/src/java.desktop/unix/native/libawt_xawt/java2d/x11/XRSurfaceData.c : jdk/src/solaris/native/sun/java2d/x11/XRSurfaceData.c
|
||||
jdk/src/java.desktop/unix/native/libawt_xawt/xawt : jdk/src/solaris/native/sun/xawt
|
||||
jdk/src/java.desktop/unix/native/libfontmanager/X11FontScaler.c : jdk/src/solaris/native/sun/font/X11FontScaler.c
|
||||
jdk/src/java.desktop/unix/native/libfontmanager/X11TextRenderer.c : jdk/src/solaris/native/sun/font/X11TextRenderer.c
|
||||
jdk/src/java.desktop/unix/native/libjawt/jawt.c : jdk/src/solaris/native/sun/awt/jawt.c
|
||||
@ -978,168 +978,168 @@ jdk/src/java.desktop/windows/classes/sun/awt/windows/ThemeReader.java : jdk/src/
|
||||
jdk/src/java.desktop/windows/classes/sun/font : jdk/src/windows/classes/sun/font
|
||||
jdk/src/java.desktop/windows/conf/flavormap.properties : jdk/src/windows/lib/flavormap.properties
|
||||
jdk/src/java.desktop/windows/conf/images/cursors/cursors.properties : jdk/src/windows/lib/images/cursors/cursors.properties
|
||||
jdk/src/java.desktop/windows/native/common/sun/awt/utility/rect.h : jdk/src/windows/native/sun/awt/utility/rect.h
|
||||
jdk/src/java.desktop/windows/native/common/awt/utility/rect.h : jdk/src/windows/native/sun/awt/utility/rect.h
|
||||
jdk/src/java.desktop/windows/native/include/jawt_md.h : jdk/src/windows/javavm/export/jawt_md.h
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/java2d/d3d : jdk/src/windows/native/sun/java2d/d3d
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/java2d : jdk/src/windows/native/sun/java2d
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/alloc.h : jdk/src/windows/native/sun/windows/alloc.h
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_AWTEvent.cpp : jdk/src/windows/native/sun/windows/awt_AWTEvent.cpp
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_AWTEvent.h : jdk/src/windows/native/sun/windows/awt_AWTEvent.h
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_BitmapUtil.cpp : jdk/src/windows/native/sun/windows/awt_BitmapUtil.cpp
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_BitmapUtil.h : jdk/src/windows/native/sun/windows/awt_BitmapUtil.h
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Brush.cpp : jdk/src/windows/native/sun/windows/awt_Brush.cpp
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Brush.h : jdk/src/windows/native/sun/windows/awt_Brush.h
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Button.cpp : jdk/src/windows/native/sun/windows/awt_Button.cpp
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Button.h : jdk/src/windows/native/sun/windows/awt_Button.h
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Canvas.cpp : jdk/src/windows/native/sun/windows/awt_Canvas.cpp
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Canvas.h : jdk/src/windows/native/sun/windows/awt_Canvas.h
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Checkbox.cpp : jdk/src/windows/native/sun/windows/awt_Checkbox.cpp
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Checkbox.h : jdk/src/windows/native/sun/windows/awt_Checkbox.h
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Choice.cpp : jdk/src/windows/native/sun/windows/awt_Choice.cpp
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Choice.h : jdk/src/windows/native/sun/windows/awt_Choice.h
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Clipboard.cpp : jdk/src/windows/native/sun/windows/awt_Clipboard.cpp
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Clipboard.h : jdk/src/windows/native/sun/windows/awt_Clipboard.h
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Color.cpp : jdk/src/windows/native/sun/windows/awt_Color.cpp
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Color.h : jdk/src/windows/native/sun/windows/awt_Color.h
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Component.cpp : jdk/src/windows/native/sun/windows/awt_Component.cpp
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Component.h : jdk/src/windows/native/sun/windows/awt_Component.h
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Container.cpp : jdk/src/windows/native/sun/windows/awt_Container.cpp
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Container.h : jdk/src/windows/native/sun/windows/awt_Container.h
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Cursor.cpp : jdk/src/windows/native/sun/windows/awt_Cursor.cpp
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Cursor.h : jdk/src/windows/native/sun/windows/awt_Cursor.h
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_CustomPaletteDef.h : jdk/src/windows/native/sun/windows/awt_CustomPaletteDef.h
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_DataTransferer.cpp : jdk/src/windows/native/sun/windows/awt_DataTransferer.cpp
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_DataTransferer.h : jdk/src/windows/native/sun/windows/awt_DataTransferer.h
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_DCHolder.cpp : jdk/src/windows/native/sun/windows/awt_DCHolder.cpp
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_DCHolder.h : jdk/src/windows/native/sun/windows/awt_DCHolder.h
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Debug.cpp : jdk/src/windows/native/sun/windows/awt_Debug.cpp
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Debug.h : jdk/src/windows/native/sun/windows/awt_Debug.h
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Desktop.cpp : jdk/src/windows/native/sun/windows/awt_Desktop.cpp
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_DesktopProperties.cpp : jdk/src/windows/native/sun/windows/awt_DesktopProperties.cpp
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_DesktopProperties.h : jdk/src/windows/native/sun/windows/awt_DesktopProperties.h
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Dialog.cpp : jdk/src/windows/native/sun/windows/awt_Dialog.cpp
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Dialog.h : jdk/src/windows/native/sun/windows/awt_Dialog.h
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Dimension.cpp : jdk/src/windows/native/sun/windows/awt_Dimension.cpp
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Dimension.h : jdk/src/windows/native/sun/windows/awt_Dimension.h
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_DnDDS.cpp : jdk/src/windows/native/sun/windows/awt_DnDDS.cpp
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_DnDDS.h : jdk/src/windows/native/sun/windows/awt_DnDDS.h
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_DnDDT.cpp : jdk/src/windows/native/sun/windows/awt_DnDDT.cpp
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_DnDDT.h : jdk/src/windows/native/sun/windows/awt_DnDDT.h
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_DrawingSurface.cpp : jdk/src/windows/native/sun/windows/awt_DrawingSurface.cpp
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_DrawingSurface.h : jdk/src/windows/native/sun/windows/awt_DrawingSurface.h
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Event.cpp : jdk/src/windows/native/sun/windows/awt_Event.cpp
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Event.h : jdk/src/windows/native/sun/windows/awt_Event.h
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_FileDialog.cpp : jdk/src/windows/native/sun/windows/awt_FileDialog.cpp
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_FileDialog.h : jdk/src/windows/native/sun/windows/awt_FileDialog.h
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Font.cpp : jdk/src/windows/native/sun/windows/awt_Font.cpp
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Font.h : jdk/src/windows/native/sun/windows/awt_Font.h
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Frame.cpp : jdk/src/windows/native/sun/windows/awt_Frame.cpp
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Frame.h : jdk/src/windows/native/sun/windows/awt_Frame.h
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_GDIObject.cpp : jdk/src/windows/native/sun/windows/awt_GDIObject.cpp
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_GDIObject.h : jdk/src/windows/native/sun/windows/awt_GDIObject.h
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/awt.h : jdk/src/windows/native/sun/windows/awt.h
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_IconCursor.cpp : jdk/src/windows/native/sun/windows/awt_IconCursor.cpp
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_IconCursor.h : jdk/src/windows/native/sun/windows/awt_IconCursor.h
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_InputEvent.cpp : jdk/src/windows/native/sun/windows/awt_InputEvent.cpp
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_InputEvent.h : jdk/src/windows/native/sun/windows/awt_InputEvent.h
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_InputMethod.cpp : jdk/src/windows/native/sun/windows/awt_InputMethod.cpp
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_InputTextInfor.cpp : jdk/src/windows/native/sun/windows/awt_InputTextInfor.cpp
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_InputTextInfor.h : jdk/src/windows/native/sun/windows/awt_InputTextInfor.h
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Insets.cpp : jdk/src/windows/native/sun/windows/awt_Insets.cpp
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Insets.h : jdk/src/windows/native/sun/windows/awt_Insets.h
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_KeyboardFocusManager.cpp : jdk/src/windows/native/sun/windows/awt_KeyboardFocusManager.cpp
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_KeyEvent.cpp : jdk/src/windows/native/sun/windows/awt_KeyEvent.cpp
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_KeyEvent.h : jdk/src/windows/native/sun/windows/awt_KeyEvent.h
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Label.cpp : jdk/src/windows/native/sun/windows/awt_Label.cpp
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Label.h : jdk/src/windows/native/sun/windows/awt_Label.h
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_List.cpp : jdk/src/windows/native/sun/windows/awt_List.cpp
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_List.h : jdk/src/windows/native/sun/windows/awt_List.h
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_MenuBar.cpp : jdk/src/windows/native/sun/windows/awt_MenuBar.cpp
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_MenuBar.h : jdk/src/windows/native/sun/windows/awt_MenuBar.h
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Menu.cpp : jdk/src/windows/native/sun/windows/awt_Menu.cpp
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Menu.h : jdk/src/windows/native/sun/windows/awt_Menu.h
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_MenuItem.cpp : jdk/src/windows/native/sun/windows/awt_MenuItem.cpp
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_MenuItem.h : jdk/src/windows/native/sun/windows/awt_MenuItem.h
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Mlib.cpp : jdk/src/windows/native/sun/windows/awt_Mlib.cpp
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Mlib.h : jdk/src/windows/native/sun/windows/awt_Mlib.h
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_MouseEvent.cpp : jdk/src/windows/native/sun/windows/awt_MouseEvent.cpp
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_MouseEvent.h : jdk/src/windows/native/sun/windows/awt_MouseEvent.h
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/awtmsg.h : jdk/src/windows/native/sun/windows/awtmsg.h
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_new.cpp : jdk/src/windows/native/sun/windows/awt_new.cpp
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_new.h : jdk/src/windows/native/sun/windows/awt_new.h
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Object.cpp : jdk/src/windows/native/sun/windows/awt_Object.cpp
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Object.h : jdk/src/windows/native/sun/windows/awt_Object.h
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_ole.cpp : jdk/src/windows/native/sun/windows/awt_ole.cpp
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_ole.h : jdk/src/windows/native/sun/windows/awt_ole.h
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Palette.cpp : jdk/src/windows/native/sun/windows/awt_Palette.cpp
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Palette.h : jdk/src/windows/native/sun/windows/awt_Palette.h
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Panel.cpp : jdk/src/windows/native/sun/windows/awt_Panel.cpp
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Panel.h : jdk/src/windows/native/sun/windows/awt_Panel.h
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Pen.cpp : jdk/src/windows/native/sun/windows/awt_Pen.cpp
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Pen.h : jdk/src/windows/native/sun/windows/awt_Pen.h
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_PopupMenu.cpp : jdk/src/windows/native/sun/windows/awt_PopupMenu.cpp
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_PopupMenu.h : jdk/src/windows/native/sun/windows/awt_PopupMenu.h
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_PrintControl.cpp : jdk/src/windows/native/sun/windows/awt_PrintControl.cpp
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_PrintControl.h : jdk/src/windows/native/sun/windows/awt_PrintControl.h
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_PrintDialog.cpp : jdk/src/windows/native/sun/windows/awt_PrintDialog.cpp
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_PrintDialog.h : jdk/src/windows/native/sun/windows/awt_PrintDialog.h
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_PrintJob.cpp : jdk/src/windows/native/sun/windows/awt_PrintJob.cpp
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/awt.rc : jdk/src/windows/native/sun/windows/awt.rc
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Rectangle.cpp : jdk/src/windows/native/sun/windows/awt_Rectangle.cpp
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Rectangle.h : jdk/src/windows/native/sun/windows/awt_Rectangle.h
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Robot.cpp : jdk/src/windows/native/sun/windows/awt_Robot.cpp
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Robot.h : jdk/src/windows/native/sun/windows/awt_Robot.h
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Scrollbar.cpp : jdk/src/windows/native/sun/windows/awt_Scrollbar.cpp
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Scrollbar.h : jdk/src/windows/native/sun/windows/awt_Scrollbar.h
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_ScrollPane.cpp : jdk/src/windows/native/sun/windows/awt_ScrollPane.cpp
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_ScrollPane.h : jdk/src/windows/native/sun/windows/awt_ScrollPane.h
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_TextArea.cpp : jdk/src/windows/native/sun/windows/awt_TextArea.cpp
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_TextArea.h : jdk/src/windows/native/sun/windows/awt_TextArea.h
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_TextComponent.cpp : jdk/src/windows/native/sun/windows/awt_TextComponent.cpp
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_TextComponent.h : jdk/src/windows/native/sun/windows/awt_TextComponent.h
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_TextField.cpp : jdk/src/windows/native/sun/windows/awt_TextField.cpp
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_TextField.h : jdk/src/windows/native/sun/windows/awt_TextField.h
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Toolkit.cpp : jdk/src/windows/native/sun/windows/awt_Toolkit.cpp
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Toolkit.h : jdk/src/windows/native/sun/windows/awt_Toolkit.h
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_TrayIcon.cpp : jdk/src/windows/native/sun/windows/awt_TrayIcon.cpp
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_TrayIcon.h : jdk/src/windows/native/sun/windows/awt_TrayIcon.h
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Win32GraphicsConfig.cpp : jdk/src/windows/native/sun/windows/awt_Win32GraphicsConfig.cpp
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Win32GraphicsConfig.h : jdk/src/windows/native/sun/windows/awt_Win32GraphicsConfig.h
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Win32GraphicsDevice.cpp : jdk/src/windows/native/sun/windows/awt_Win32GraphicsDevice.cpp
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Win32GraphicsDevice.h : jdk/src/windows/native/sun/windows/awt_Win32GraphicsDevice.h
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Win32GraphicsEnv.cpp : jdk/src/windows/native/sun/windows/awt_Win32GraphicsEnv.cpp
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Window.cpp : jdk/src/windows/native/sun/windows/awt_Window.cpp
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/awt_Window.h : jdk/src/windows/native/sun/windows/awt_Window.h
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/check.bmp : jdk/src/windows/native/sun/windows/check.bmp
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/CmdIDList.cpp : jdk/src/windows/native/sun/windows/CmdIDList.cpp
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/CmdIDList.h : jdk/src/windows/native/sun/windows/CmdIDList.h
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/colordata.h : jdk/src/windows/native/sun/windows/colordata.h
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/ComCtl32Util.cpp : jdk/src/windows/native/sun/windows/ComCtl32Util.cpp
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/ComCtl32Util.h : jdk/src/windows/native/sun/windows/ComCtl32Util.h
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/Devices.cpp : jdk/src/windows/native/sun/windows/Devices.cpp
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/Devices.h : jdk/src/windows/native/sun/windows/Devices.h
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/DllUtil.cpp : jdk/src/windows/native/sun/windows/DllUtil.cpp
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/DllUtil.h : jdk/src/windows/native/sun/windows/DllUtil.h
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/GDIHashtable.cpp : jdk/src/windows/native/sun/windows/GDIHashtable.cpp
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/GDIHashtable.h : jdk/src/windows/native/sun/windows/GDIHashtable.h
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/hand.cur : jdk/src/windows/native/sun/windows/hand.cur
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/Hashtable.cpp : jdk/src/windows/native/sun/windows/Hashtable.cpp
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/Hashtable.h : jdk/src/windows/native/sun/windows/Hashtable.h
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/img_util_md.h : jdk/src/windows/native/sun/windows/img_util_md.h
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/initIDs.cpp : jdk/src/windows/native/sun/windows/initIDs.cpp
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/mlib_types_md.h : jdk/src/windows/native/sun/windows/mlib_types_md.h
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/MouseInfo.cpp : jdk/src/windows/native/sun/windows/MouseInfo.cpp
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/ObjectList.cpp : jdk/src/windows/native/sun/windows/ObjectList.cpp
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/ObjectList.h : jdk/src/windows/native/sun/windows/ObjectList.h
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/README.JNI : jdk/src/windows/native/sun/windows/README.JNI
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/security_warning_bw.ico : jdk/src/windows/native/sun/windows/security_warning_bw.ico
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/security_warning.ico : jdk/src/windows/native/sun/windows/security_warning.ico
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/security_warning_int.ico : jdk/src/windows/native/sun/windows/security_warning_int.ico
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/ShellFolder2.cpp : jdk/src/windows/native/sun/windows/ShellFolder2.cpp
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/stdhdrs.h : jdk/src/windows/native/sun/windows/stdhdrs.h
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/ThemeReader.cpp : jdk/src/windows/native/sun/windows/ThemeReader.cpp
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/WBufferStrategy.cpp : jdk/src/windows/native/sun/windows/WBufferStrategy.cpp
|
||||
jdk/src/java.desktop/windows/native/libawt/sun/windows/WPrinterJob.cpp : jdk/src/windows/native/sun/windows/WPrinterJob.cpp
|
||||
jdk/src/java.desktop/windows/native/libawt/java2d/d3d : jdk/src/windows/native/sun/java2d/d3d
|
||||
jdk/src/java.desktop/windows/native/libawt/java2d : jdk/src/windows/native/sun/java2d
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/alloc.h : jdk/src/windows/native/sun/windows/alloc.h
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/awt_AWTEvent.cpp : jdk/src/windows/native/sun/windows/awt_AWTEvent.cpp
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/awt_AWTEvent.h : jdk/src/windows/native/sun/windows/awt_AWTEvent.h
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/awt_BitmapUtil.cpp : jdk/src/windows/native/sun/windows/awt_BitmapUtil.cpp
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/awt_BitmapUtil.h : jdk/src/windows/native/sun/windows/awt_BitmapUtil.h
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/awt_Brush.cpp : jdk/src/windows/native/sun/windows/awt_Brush.cpp
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/awt_Brush.h : jdk/src/windows/native/sun/windows/awt_Brush.h
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/awt_Button.cpp : jdk/src/windows/native/sun/windows/awt_Button.cpp
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/awt_Button.h : jdk/src/windows/native/sun/windows/awt_Button.h
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/awt_Canvas.cpp : jdk/src/windows/native/sun/windows/awt_Canvas.cpp
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/awt_Canvas.h : jdk/src/windows/native/sun/windows/awt_Canvas.h
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/awt_Checkbox.cpp : jdk/src/windows/native/sun/windows/awt_Checkbox.cpp
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/awt_Checkbox.h : jdk/src/windows/native/sun/windows/awt_Checkbox.h
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/awt_Choice.cpp : jdk/src/windows/native/sun/windows/awt_Choice.cpp
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/awt_Choice.h : jdk/src/windows/native/sun/windows/awt_Choice.h
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/awt_Clipboard.cpp : jdk/src/windows/native/sun/windows/awt_Clipboard.cpp
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/awt_Clipboard.h : jdk/src/windows/native/sun/windows/awt_Clipboard.h
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/awt_Color.cpp : jdk/src/windows/native/sun/windows/awt_Color.cpp
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/awt_Color.h : jdk/src/windows/native/sun/windows/awt_Color.h
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/awt_Component.cpp : jdk/src/windows/native/sun/windows/awt_Component.cpp
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/awt_Component.h : jdk/src/windows/native/sun/windows/awt_Component.h
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/awt_Container.cpp : jdk/src/windows/native/sun/windows/awt_Container.cpp
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/awt_Container.h : jdk/src/windows/native/sun/windows/awt_Container.h
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/awt_Cursor.cpp : jdk/src/windows/native/sun/windows/awt_Cursor.cpp
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/awt_Cursor.h : jdk/src/windows/native/sun/windows/awt_Cursor.h
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/awt_CustomPaletteDef.h : jdk/src/windows/native/sun/windows/awt_CustomPaletteDef.h
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/awt_DataTransferer.cpp : jdk/src/windows/native/sun/windows/awt_DataTransferer.cpp
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/awt_DataTransferer.h : jdk/src/windows/native/sun/windows/awt_DataTransferer.h
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/awt_DCHolder.cpp : jdk/src/windows/native/sun/windows/awt_DCHolder.cpp
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/awt_DCHolder.h : jdk/src/windows/native/sun/windows/awt_DCHolder.h
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/awt_Debug.cpp : jdk/src/windows/native/sun/windows/awt_Debug.cpp
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/awt_Debug.h : jdk/src/windows/native/sun/windows/awt_Debug.h
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/awt_Desktop.cpp : jdk/src/windows/native/sun/windows/awt_Desktop.cpp
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/awt_DesktopProperties.cpp : jdk/src/windows/native/sun/windows/awt_DesktopProperties.cpp
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/awt_DesktopProperties.h : jdk/src/windows/native/sun/windows/awt_DesktopProperties.h
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/awt_Dialog.cpp : jdk/src/windows/native/sun/windows/awt_Dialog.cpp
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/awt_Dialog.h : jdk/src/windows/native/sun/windows/awt_Dialog.h
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/awt_Dimension.cpp : jdk/src/windows/native/sun/windows/awt_Dimension.cpp
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/awt_Dimension.h : jdk/src/windows/native/sun/windows/awt_Dimension.h
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/awt_DnDDS.cpp : jdk/src/windows/native/sun/windows/awt_DnDDS.cpp
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/awt_DnDDS.h : jdk/src/windows/native/sun/windows/awt_DnDDS.h
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/awt_DnDDT.cpp : jdk/src/windows/native/sun/windows/awt_DnDDT.cpp
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/awt_DnDDT.h : jdk/src/windows/native/sun/windows/awt_DnDDT.h
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/awt_DrawingSurface.cpp : jdk/src/windows/native/sun/windows/awt_DrawingSurface.cpp
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/awt_DrawingSurface.h : jdk/src/windows/native/sun/windows/awt_DrawingSurface.h
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/awt_Event.cpp : jdk/src/windows/native/sun/windows/awt_Event.cpp
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/awt_Event.h : jdk/src/windows/native/sun/windows/awt_Event.h
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/awt_FileDialog.cpp : jdk/src/windows/native/sun/windows/awt_FileDialog.cpp
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/awt_FileDialog.h : jdk/src/windows/native/sun/windows/awt_FileDialog.h
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/awt_Font.cpp : jdk/src/windows/native/sun/windows/awt_Font.cpp
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/awt_Font.h : jdk/src/windows/native/sun/windows/awt_Font.h
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/awt_Frame.cpp : jdk/src/windows/native/sun/windows/awt_Frame.cpp
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/awt_Frame.h : jdk/src/windows/native/sun/windows/awt_Frame.h
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/awt_GDIObject.cpp : jdk/src/windows/native/sun/windows/awt_GDIObject.cpp
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/awt_GDIObject.h : jdk/src/windows/native/sun/windows/awt_GDIObject.h
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/awt.h : jdk/src/windows/native/sun/windows/awt.h
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/awt_IconCursor.cpp : jdk/src/windows/native/sun/windows/awt_IconCursor.cpp
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/awt_IconCursor.h : jdk/src/windows/native/sun/windows/awt_IconCursor.h
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/awt_InputEvent.cpp : jdk/src/windows/native/sun/windows/awt_InputEvent.cpp
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/awt_InputEvent.h : jdk/src/windows/native/sun/windows/awt_InputEvent.h
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/awt_InputMethod.cpp : jdk/src/windows/native/sun/windows/awt_InputMethod.cpp
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/awt_InputTextInfor.cpp : jdk/src/windows/native/sun/windows/awt_InputTextInfor.cpp
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/awt_InputTextInfor.h : jdk/src/windows/native/sun/windows/awt_InputTextInfor.h
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/awt_Insets.cpp : jdk/src/windows/native/sun/windows/awt_Insets.cpp
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/awt_Insets.h : jdk/src/windows/native/sun/windows/awt_Insets.h
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/awt_KeyboardFocusManager.cpp : jdk/src/windows/native/sun/windows/awt_KeyboardFocusManager.cpp
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/awt_KeyEvent.cpp : jdk/src/windows/native/sun/windows/awt_KeyEvent.cpp
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/awt_KeyEvent.h : jdk/src/windows/native/sun/windows/awt_KeyEvent.h
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/awt_Label.cpp : jdk/src/windows/native/sun/windows/awt_Label.cpp
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/awt_Label.h : jdk/src/windows/native/sun/windows/awt_Label.h
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/awt_List.cpp : jdk/src/windows/native/sun/windows/awt_List.cpp
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/awt_List.h : jdk/src/windows/native/sun/windows/awt_List.h
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/awt_MenuBar.cpp : jdk/src/windows/native/sun/windows/awt_MenuBar.cpp
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/awt_MenuBar.h : jdk/src/windows/native/sun/windows/awt_MenuBar.h
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/awt_Menu.cpp : jdk/src/windows/native/sun/windows/awt_Menu.cpp
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/awt_Menu.h : jdk/src/windows/native/sun/windows/awt_Menu.h
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/awt_MenuItem.cpp : jdk/src/windows/native/sun/windows/awt_MenuItem.cpp
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/awt_MenuItem.h : jdk/src/windows/native/sun/windows/awt_MenuItem.h
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/awt_Mlib.cpp : jdk/src/windows/native/sun/windows/awt_Mlib.cpp
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/awt_Mlib.h : jdk/src/windows/native/sun/windows/awt_Mlib.h
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/awt_MouseEvent.cpp : jdk/src/windows/native/sun/windows/awt_MouseEvent.cpp
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/awt_MouseEvent.h : jdk/src/windows/native/sun/windows/awt_MouseEvent.h
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/awtmsg.h : jdk/src/windows/native/sun/windows/awtmsg.h
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/awt_new.cpp : jdk/src/windows/native/sun/windows/awt_new.cpp
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/awt_new.h : jdk/src/windows/native/sun/windows/awt_new.h
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/awt_Object.cpp : jdk/src/windows/native/sun/windows/awt_Object.cpp
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/awt_Object.h : jdk/src/windows/native/sun/windows/awt_Object.h
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/awt_ole.cpp : jdk/src/windows/native/sun/windows/awt_ole.cpp
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/awt_ole.h : jdk/src/windows/native/sun/windows/awt_ole.h
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/awt_Palette.cpp : jdk/src/windows/native/sun/windows/awt_Palette.cpp
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/awt_Palette.h : jdk/src/windows/native/sun/windows/awt_Palette.h
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/awt_Panel.cpp : jdk/src/windows/native/sun/windows/awt_Panel.cpp
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/awt_Panel.h : jdk/src/windows/native/sun/windows/awt_Panel.h
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/awt_Pen.cpp : jdk/src/windows/native/sun/windows/awt_Pen.cpp
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/awt_Pen.h : jdk/src/windows/native/sun/windows/awt_Pen.h
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/awt_PopupMenu.cpp : jdk/src/windows/native/sun/windows/awt_PopupMenu.cpp
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/awt_PopupMenu.h : jdk/src/windows/native/sun/windows/awt_PopupMenu.h
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/awt_PrintControl.cpp : jdk/src/windows/native/sun/windows/awt_PrintControl.cpp
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/awt_PrintControl.h : jdk/src/windows/native/sun/windows/awt_PrintControl.h
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/awt_PrintDialog.cpp : jdk/src/windows/native/sun/windows/awt_PrintDialog.cpp
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/awt_PrintDialog.h : jdk/src/windows/native/sun/windows/awt_PrintDialog.h
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/awt_PrintJob.cpp : jdk/src/windows/native/sun/windows/awt_PrintJob.cpp
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/awt.rc : jdk/src/windows/native/sun/windows/awt.rc
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/awt_Rectangle.cpp : jdk/src/windows/native/sun/windows/awt_Rectangle.cpp
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/awt_Rectangle.h : jdk/src/windows/native/sun/windows/awt_Rectangle.h
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/awt_Robot.cpp : jdk/src/windows/native/sun/windows/awt_Robot.cpp
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/awt_Robot.h : jdk/src/windows/native/sun/windows/awt_Robot.h
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/awt_Scrollbar.cpp : jdk/src/windows/native/sun/windows/awt_Scrollbar.cpp
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/awt_Scrollbar.h : jdk/src/windows/native/sun/windows/awt_Scrollbar.h
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/awt_ScrollPane.cpp : jdk/src/windows/native/sun/windows/awt_ScrollPane.cpp
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/awt_ScrollPane.h : jdk/src/windows/native/sun/windows/awt_ScrollPane.h
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/awt_TextArea.cpp : jdk/src/windows/native/sun/windows/awt_TextArea.cpp
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/awt_TextArea.h : jdk/src/windows/native/sun/windows/awt_TextArea.h
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/awt_TextComponent.cpp : jdk/src/windows/native/sun/windows/awt_TextComponent.cpp
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/awt_TextComponent.h : jdk/src/windows/native/sun/windows/awt_TextComponent.h
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/awt_TextField.cpp : jdk/src/windows/native/sun/windows/awt_TextField.cpp
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/awt_TextField.h : jdk/src/windows/native/sun/windows/awt_TextField.h
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/awt_Toolkit.cpp : jdk/src/windows/native/sun/windows/awt_Toolkit.cpp
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/awt_Toolkit.h : jdk/src/windows/native/sun/windows/awt_Toolkit.h
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/awt_TrayIcon.cpp : jdk/src/windows/native/sun/windows/awt_TrayIcon.cpp
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/awt_TrayIcon.h : jdk/src/windows/native/sun/windows/awt_TrayIcon.h
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/awt_Win32GraphicsConfig.cpp : jdk/src/windows/native/sun/windows/awt_Win32GraphicsConfig.cpp
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/awt_Win32GraphicsConfig.h : jdk/src/windows/native/sun/windows/awt_Win32GraphicsConfig.h
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/awt_Win32GraphicsDevice.cpp : jdk/src/windows/native/sun/windows/awt_Win32GraphicsDevice.cpp
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/awt_Win32GraphicsDevice.h : jdk/src/windows/native/sun/windows/awt_Win32GraphicsDevice.h
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/awt_Win32GraphicsEnv.cpp : jdk/src/windows/native/sun/windows/awt_Win32GraphicsEnv.cpp
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/awt_Window.cpp : jdk/src/windows/native/sun/windows/awt_Window.cpp
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/awt_Window.h : jdk/src/windows/native/sun/windows/awt_Window.h
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/check.bmp : jdk/src/windows/native/sun/windows/check.bmp
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/CmdIDList.cpp : jdk/src/windows/native/sun/windows/CmdIDList.cpp
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/CmdIDList.h : jdk/src/windows/native/sun/windows/CmdIDList.h
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/colordata.h : jdk/src/windows/native/sun/windows/colordata.h
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/ComCtl32Util.cpp : jdk/src/windows/native/sun/windows/ComCtl32Util.cpp
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/ComCtl32Util.h : jdk/src/windows/native/sun/windows/ComCtl32Util.h
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/Devices.cpp : jdk/src/windows/native/sun/windows/Devices.cpp
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/Devices.h : jdk/src/windows/native/sun/windows/Devices.h
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/DllUtil.cpp : jdk/src/windows/native/sun/windows/DllUtil.cpp
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/DllUtil.h : jdk/src/windows/native/sun/windows/DllUtil.h
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/GDIHashtable.cpp : jdk/src/windows/native/sun/windows/GDIHashtable.cpp
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/GDIHashtable.h : jdk/src/windows/native/sun/windows/GDIHashtable.h
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/hand.cur : jdk/src/windows/native/sun/windows/hand.cur
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/Hashtable.cpp : jdk/src/windows/native/sun/windows/Hashtable.cpp
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/Hashtable.h : jdk/src/windows/native/sun/windows/Hashtable.h
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/img_util_md.h : jdk/src/windows/native/sun/windows/img_util_md.h
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/initIDs.cpp : jdk/src/windows/native/sun/windows/initIDs.cpp
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/mlib_types_md.h : jdk/src/windows/native/sun/windows/mlib_types_md.h
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/MouseInfo.cpp : jdk/src/windows/native/sun/windows/MouseInfo.cpp
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/ObjectList.cpp : jdk/src/windows/native/sun/windows/ObjectList.cpp
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/ObjectList.h : jdk/src/windows/native/sun/windows/ObjectList.h
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/README.JNI : jdk/src/windows/native/sun/windows/README.JNI
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/security_warning_bw.ico : jdk/src/windows/native/sun/windows/security_warning_bw.ico
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/security_warning.ico : jdk/src/windows/native/sun/windows/security_warning.ico
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/security_warning_int.ico : jdk/src/windows/native/sun/windows/security_warning_int.ico
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/ShellFolder2.cpp : jdk/src/windows/native/sun/windows/ShellFolder2.cpp
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/stdhdrs.h : jdk/src/windows/native/sun/windows/stdhdrs.h
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/ThemeReader.cpp : jdk/src/windows/native/sun/windows/ThemeReader.cpp
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/WBufferStrategy.cpp : jdk/src/windows/native/sun/windows/WBufferStrategy.cpp
|
||||
jdk/src/java.desktop/windows/native/libawt/windows/WPrinterJob.cpp : jdk/src/windows/native/sun/windows/WPrinterJob.cpp
|
||||
jdk/src/java.desktop/windows/native/libfontmanager : jdk/src/windows/native/sun/font
|
||||
jdk/src/java.desktop/windows/native/libjawt/jawt.cpp : jdk/src/windows/native/sun/windows/jawt.cpp
|
||||
jdk/src/java.desktop/windows/native/libjsound : jdk/src/windows/native/com/sun/media/sound
|
||||
|
||||
@ -35,11 +35,11 @@ usage() {
|
||||
exit 1
|
||||
}
|
||||
|
||||
SCRIPT_DIR=`pwd`/`dirname $0`
|
||||
SCRIPT_DIR=`dirname $0`
|
||||
UNSHUFFLE_LIST=$SCRIPT_DIR"/unshuffle_list.txt"
|
||||
|
||||
if [ ! -f "$UNSHUFFLE_LIST" ] ; then
|
||||
echo "FATAL: cannot find $UNSHUFFLE_LIST"
|
||||
echo "FATAL: cannot find $UNSHUFFLE_LIST" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
@ -68,7 +68,7 @@ done
|
||||
|
||||
# Make sure we have the right number of arguments
|
||||
if [ ! $# -eq 3 ] ; then
|
||||
echo "ERROR: Invalid number of arguments."
|
||||
echo "ERROR: Invalid number of arguments." >&2
|
||||
usage
|
||||
fi
|
||||
|
||||
@ -83,21 +83,28 @@ for r in $repos ; do
|
||||
fi
|
||||
done
|
||||
if [ $found = "false" ] ; then
|
||||
echo "ERROR: Unknown repo: $repo. Should be one of [$repos]."
|
||||
echo "ERROR: Unknown repo: $repo. Should be one of [$repos]." >&2
|
||||
usage
|
||||
fi
|
||||
|
||||
# Check given input/output files
|
||||
input="$2"
|
||||
output="$3"
|
||||
if [ "x$input" = "x-" ] ; then
|
||||
input="/dev/stdin"
|
||||
fi
|
||||
|
||||
if [ ! -f $input ] ; then
|
||||
echo "ERROR: Cannot find input patch file: $input"
|
||||
if [ ! -f $input -a "x$input" != "x/dev/stdin" ] ; then
|
||||
echo "ERROR: Cannot find input patch file: $input" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [ -f $output ] ; then
|
||||
echo "ERROR: Output patch already exists: $output"
|
||||
output="$3"
|
||||
if [ "x$output" = "x-" ] ; then
|
||||
output="/dev/stdout"
|
||||
fi
|
||||
|
||||
if [ -f $output -a "x$output" != "x/dev/stdout" ] ; then
|
||||
echo "ERROR: Output patch already exists: $output" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
@ -105,7 +112,7 @@ what="" ## shuffle or unshuffle
|
||||
|
||||
verbose() {
|
||||
if [ ${vflag} = "true" ] ; then
|
||||
echo "$@"
|
||||
echo "$@" >&2
|
||||
fi
|
||||
}
|
||||
|
||||
@ -117,7 +124,7 @@ unshuffle() {
|
||||
path=
|
||||
if echo "$line" | egrep '^diff' > /dev/null ; then
|
||||
if ! echo "$line" | egrep '\-\-git' > /dev/null ; then
|
||||
echo "ERROR: Only git patches supported. Please use 'hg export --git ...'."
|
||||
echo "ERROR: Only git patches supported. Please use 'hg export --git ...'." >&2
|
||||
exit 1
|
||||
fi
|
||||
path="`echo "$line" | sed -e s@'diff --git a/'@@ -e s@' b/.*$'@@`"
|
||||
|
||||
@ -274,3 +274,4 @@ a00b04ef067e39f50b9a0fea6f1904e35d632a73 jdk9-b28
|
||||
163a9cd806fd09970baf1f5f42b92a3cfe7ee945 jdk9-b29
|
||||
98967ae6ae53ebf15615e07cd5a6b1ae04dfd84c jdk9-b30
|
||||
c432b80aadd0cb2b2361b02add4d671957d4cec9 jdk9-b31
|
||||
b5b139354630edb2d06190bf31653acbdcea63a8 jdk9-b32
|
||||
|
||||
@ -434,3 +434,4 @@ f95347244306affc32ce3056f27ceff7b2100810 jdk9-b27
|
||||
deb29e92f68ace2808a36ecfa18c7d61dcb645bb jdk9-b29
|
||||
5c722dffbc0f34eb8d903dca7b261e52248fa17e jdk9-b30
|
||||
9f7d155d28e519f3e4645dc21cf185c25f3176ed jdk9-b31
|
||||
af46576a8d7cb4003028b8ee8bf408cfe227315b jdk9-b32
|
||||
|
||||
@ -107,7 +107,6 @@ public class VM {
|
||||
private Runtime1 runtime1;
|
||||
/** These constants come from globalDefinitions.hpp */
|
||||
private int invocationEntryBCI;
|
||||
private int invalidOSREntryBCI;
|
||||
private ReversePtrs revPtrs;
|
||||
private VMRegImpl vmregImpl;
|
||||
private int reserveForAllocationPrefetch;
|
||||
@ -295,7 +294,6 @@ public class VM {
|
||||
|
||||
stackBias = db.lookupIntConstant("STACK_BIAS").intValue();
|
||||
invocationEntryBCI = db.lookupIntConstant("InvocationEntryBci").intValue();
|
||||
invalidOSREntryBCI = db.lookupIntConstant("InvalidOSREntryBci").intValue();
|
||||
|
||||
// We infer the presence of C1 or C2 from a couple of fields we
|
||||
// already have present in the type database
|
||||
@ -733,11 +731,6 @@ public class VM {
|
||||
return invocationEntryBCI;
|
||||
}
|
||||
|
||||
/** FIXME: figure out where to stick this */
|
||||
public int getInvalidOSREntryBCI() {
|
||||
return invalidOSREntryBCI;
|
||||
}
|
||||
|
||||
// FIXME: figure out where to stick this
|
||||
public boolean wizardMode() {
|
||||
return true;
|
||||
|
||||
@ -106,7 +106,7 @@ GENERATEDFILES = $(GENERATEDNAMES:%=$(OUTDIR)/%)
|
||||
all: $(EXEC)
|
||||
|
||||
$(EXEC) : $(OBJECTS)
|
||||
@echo Making adlc
|
||||
@echo $(LOG_INFO) Making adlc
|
||||
$(QUIETLY) $(HOST.LINK_NOPROF.CXX) -o $(EXEC) $(OBJECTS)
|
||||
|
||||
# Random dependencies:
|
||||
@ -189,7 +189,7 @@ refresh_adfiles: $(EXEC) $(SOURCE.AD) $(ADLC_UPDATER)
|
||||
$(QUIETLY) ./$(ADLC_UPDATER) adGlobals_$(Platform_arch_model).hpp $(TEMPDIR) $(OUTDIR)
|
||||
$(QUIETLY) ./$(ADLC_UPDATER) dfa_$(Platform_arch_model).cpp $(TEMPDIR) $(OUTDIR)
|
||||
$(QUIETLY) [ -f $(TEMPDIR)/made-change ] \
|
||||
|| echo "Rescanned $(SOURCE.AD) but encountered no changes."
|
||||
|| echo $(LOG_INFO) "Rescanned $(SOURCE.AD) but encountered no changes."
|
||||
$(QUIETLY) rm -rf $(TEMPDIR)
|
||||
|
||||
|
||||
@ -207,14 +207,14 @@ PROCESS_AD_FILES = awk '{ \
|
||||
print }'
|
||||
|
||||
$(OUTDIR)/%.o: %.cpp
|
||||
@echo Compiling $<
|
||||
@echo $(LOG_INFO) Compiling $<
|
||||
$(QUIETLY) $(REMOVE_TARGET)
|
||||
$(QUIETLY) $(HOST.COMPILE.CXX) -o $@ $< $(COMPILE_DONE)
|
||||
|
||||
# Some object files are given a prefix, to disambiguate
|
||||
# them from objects of the same name built for the VM.
|
||||
$(OUTDIR)/adlc-%.o: %.cpp
|
||||
@echo Compiling $<
|
||||
@echo $(LOG_INFO) Compiling $<
|
||||
$(QUIETLY) $(REMOVE_TARGET)
|
||||
$(QUIETLY) $(HOST.COMPILE.CXX) -o $@ $< $(COMPILE_DONE)
|
||||
|
||||
|
||||
@ -195,7 +195,7 @@ DATA_MODE/ppc64 = 64
|
||||
DATA_MODE = $(DATA_MODE/$(BUILDARCH))
|
||||
|
||||
flags.make: $(BUILDTREE_MAKE) ../shared_dirs.lst
|
||||
@echo Creating $@ ...
|
||||
@echo $(LOG_INFO) Creating $@ ...
|
||||
$(QUIETLY) ( \
|
||||
$(BUILDTREE_COMMENT); \
|
||||
echo; \
|
||||
@ -282,7 +282,7 @@ flags.make: $(BUILDTREE_MAKE) ../shared_dirs.lst
|
||||
) > $@
|
||||
|
||||
flags_vm.make: $(BUILDTREE_MAKE) ../shared_dirs.lst
|
||||
@echo Creating $@ ...
|
||||
@echo $(LOG_INFO) Creating $@ ...
|
||||
$(QUIETLY) ( \
|
||||
$(BUILDTREE_COMMENT); \
|
||||
echo; \
|
||||
@ -290,7 +290,7 @@ flags_vm.make: $(BUILDTREE_MAKE) ../shared_dirs.lst
|
||||
) > $@
|
||||
|
||||
../shared_dirs.lst: $(BUILDTREE_MAKE) $(GAMMADIR)/src/share/vm
|
||||
@echo Creating directory list $@
|
||||
@echo $(LOG_INFO) Creating directory list $@
|
||||
$(QUIETLY) if [ -d $(HS_ALT_SRC)/share/vm ]; then \
|
||||
find $(HS_ALT_SRC)/share/vm/* -prune \
|
||||
-type d \! \( $(TOPLEVEL_EXCLUDE_DIRS) \) -exec find {} \
|
||||
@ -301,7 +301,7 @@ flags_vm.make: $(BUILDTREE_MAKE) ../shared_dirs.lst
|
||||
\( $(ALWAYS_EXCLUDE_DIRS) \) -prune -o -type d -print \; >> $@
|
||||
|
||||
Makefile: $(BUILDTREE_MAKE)
|
||||
@echo Creating $@ ...
|
||||
@echo $(LOG_INFO) Creating $@ ...
|
||||
$(QUIETLY) ( \
|
||||
$(BUILDTREE_COMMENT); \
|
||||
echo; \
|
||||
@ -311,7 +311,7 @@ Makefile: $(BUILDTREE_MAKE)
|
||||
) > $@
|
||||
|
||||
vm.make: $(BUILDTREE_MAKE)
|
||||
@echo Creating $@ ...
|
||||
@echo $(LOG_INFO) Creating $@ ...
|
||||
$(QUIETLY) ( \
|
||||
$(BUILDTREE_COMMENT); \
|
||||
echo; \
|
||||
@ -322,7 +322,7 @@ vm.make: $(BUILDTREE_MAKE)
|
||||
) > $@
|
||||
|
||||
adlc.make: $(BUILDTREE_MAKE)
|
||||
@echo Creating $@ ...
|
||||
@echo $(LOG_INFO) Creating $@ ...
|
||||
$(QUIETLY) ( \
|
||||
$(BUILDTREE_COMMENT); \
|
||||
echo; \
|
||||
@ -332,7 +332,7 @@ adlc.make: $(BUILDTREE_MAKE)
|
||||
) > $@
|
||||
|
||||
jvmti.make: $(BUILDTREE_MAKE)
|
||||
@echo Creating $@ ...
|
||||
@echo $(LOG_INFO) Creating $@ ...
|
||||
$(QUIETLY) ( \
|
||||
$(BUILDTREE_COMMENT); \
|
||||
echo; \
|
||||
@ -342,7 +342,7 @@ jvmti.make: $(BUILDTREE_MAKE)
|
||||
) > $@
|
||||
|
||||
trace.make: $(BUILDTREE_MAKE)
|
||||
@echo Creating $@ ...
|
||||
@echo $(LOG_INFO) Creating $@ ...
|
||||
$(QUIETLY) ( \
|
||||
$(BUILDTREE_COMMENT); \
|
||||
echo; \
|
||||
@ -352,7 +352,7 @@ trace.make: $(BUILDTREE_MAKE)
|
||||
) > $@
|
||||
|
||||
sa.make: $(BUILDTREE_MAKE)
|
||||
@echo Creating $@ ...
|
||||
@echo $(LOG_INFO) Creating $@ ...
|
||||
$(QUIETLY) ( \
|
||||
$(BUILDTREE_COMMENT); \
|
||||
echo; \
|
||||
|
||||
@ -29,6 +29,12 @@
|
||||
|
||||
SLASH_JAVA ?= /java
|
||||
|
||||
define print_info
|
||||
ifneq ($$(LOG_LEVEL), warn)
|
||||
$$(shell echo >&2 "INFO: $1")
|
||||
endif
|
||||
endef
|
||||
|
||||
# Need PLATFORM (os-arch combo names) for jdk and hotspot, plus libarch name
|
||||
#ARCH:=$(shell uname -m)
|
||||
PATH_SEP = :
|
||||
@ -122,8 +128,7 @@ ifeq ($(JDK6_OR_EARLIER),0)
|
||||
# debug variants always get Full Debug Symbols (if available)
|
||||
ENABLE_FULL_DEBUG_SYMBOLS = 1
|
||||
endif
|
||||
_JUNK_ := $(shell \
|
||||
echo >&2 "INFO: ENABLE_FULL_DEBUG_SYMBOLS=$(ENABLE_FULL_DEBUG_SYMBOLS)")
|
||||
$(eval $(call print_info, "ENABLE_FULL_DEBUG_SYMBOLS=$(ENABLE_FULL_DEBUG_SYMBOLS)"))
|
||||
# since objcopy is optional, we set ZIP_DEBUGINFO_FILES later
|
||||
|
||||
ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
|
||||
@ -138,19 +143,16 @@ ifeq ($(JDK6_OR_EARLIER),0)
|
||||
endif
|
||||
OBJCOPY=$(shell test -x $(DEF_OBJCOPY) && echo $(DEF_OBJCOPY))
|
||||
ifneq ($(ALT_OBJCOPY),)
|
||||
_JUNK_ := $(shell echo >&2 "INFO: ALT_OBJCOPY=$(ALT_OBJCOPY)")
|
||||
$(eval $(call print_info, "ALT_OBJCOPY=$(ALT_OBJCOPY)"))
|
||||
OBJCOPY=$(shell test -x $(ALT_OBJCOPY) && echo $(ALT_OBJCOPY))
|
||||
endif
|
||||
|
||||
ifeq ($(OBJCOPY),)
|
||||
_JUNK_ := $(shell \
|
||||
echo >&2 "INFO: no objcopy cmd found so cannot create .debuginfo files. You may need to set ALT_OBJCOPY.")
|
||||
$(eval $(call print_info, "no objcopy cmd found so cannot create .debuginfo files. You may need to set ALT_OBJCOPY."))
|
||||
ENABLE_FULL_DEBUG_SYMBOLS=0
|
||||
_JUNK_ := $(shell \
|
||||
echo >&2 "INFO: ENABLE_FULL_DEBUG_SYMBOLS=$(ENABLE_FULL_DEBUG_SYMBOLS)")
|
||||
$(eval $(call print_info, "ENABLE_FULL_DEBUG_SYMBOLS=$(ENABLE_FULL_DEBUG_SYMBOLS)"))
|
||||
else
|
||||
_JUNK_ := $(shell \
|
||||
echo >&2 "INFO: $(OBJCOPY) cmd found so will create .debuginfo files.")
|
||||
$(eval $(call print_info, "$(OBJCOPY) cmd found so will create .debuginfo files."))
|
||||
|
||||
# Library stripping policies for .debuginfo configs:
|
||||
# all_strip - strips everything from the library
|
||||
@ -164,13 +166,11 @@ ifeq ($(JDK6_OR_EARLIER),0)
|
||||
#
|
||||
STRIP_POLICY ?= min_strip
|
||||
|
||||
_JUNK_ := $(shell \
|
||||
echo >&2 "INFO: STRIP_POLICY=$(STRIP_POLICY)")
|
||||
$(eval $(call print_info, "STRIP_POLICY=$(STRIP_POLICY)"))
|
||||
|
||||
ZIP_DEBUGINFO_FILES ?= 1
|
||||
|
||||
_JUNK_ := $(shell \
|
||||
echo >&2 "INFO: ZIP_DEBUGINFO_FILES=$(ZIP_DEBUGINFO_FILES)")
|
||||
$(eval $(call print_info, "ZIP_DEBUGINFO_FILES=$(ZIP_DEBUGINFO_FILES)"))
|
||||
endif
|
||||
endif # ENABLE_FULL_DEBUG_SYMBOLS=1
|
||||
endif # BUILD_FLAVOR
|
||||
@ -227,5 +227,3 @@ ADD_SA_BINARIES/ppc64 =
|
||||
ADD_SA_BINARIES/zero =
|
||||
|
||||
EXPORT_LIST += $(ADD_SA_BINARIES/$(HS_ARCH))
|
||||
|
||||
|
||||
|
||||
@ -55,7 +55,7 @@ ifeq ($(DEBUG_BINARIES), true)
|
||||
endif
|
||||
|
||||
$(LIBJSIG): $(JSIGSRCDIR)/jsig.c $(LIBJSIG_MAPFILE)
|
||||
@echo Making signal interposition lib...
|
||||
@echo $(LOG_INFO) Making signal interposition lib...
|
||||
$(QUIETLY) $(CXX) $(SYMFLAG) $(ARCHFLAG) $(SHARED_FLAG) $(PICFLAG) \
|
||||
$(LFLAGS_JSIG) $(JSIG_DEBUG_CFLAGS) -o $@ $< -ldl
|
||||
|
||||
|
||||
@ -76,34 +76,34 @@ $(JvmtiEnvFillClass): $(JvmtiEnvFillSource)
|
||||
$(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -d $(JvmtiOutDir) $(JvmtiEnvFillSource)
|
||||
|
||||
$(JvmtiOutDir)/jvmtiEnter.cpp: $(both) $(JvmtiSrcDir)/jvmtiEnter.xsl
|
||||
@echo Generating $@
|
||||
@echo $(LOG_INFO) Generating $@
|
||||
$(XSLT) -IN $(JvmtiSrcDir)/jvmti.xml -XSL $(JvmtiSrcDir)/jvmtiEnter.xsl -OUT $(JvmtiOutDir)/jvmtiEnter.cpp -PARAM interface jvmti
|
||||
|
||||
$(JvmtiOutDir)/bytecodeInterpreterWithChecks.cpp: $(JvmtiGenClass) $(InterpreterSrcDir)/bytecodeInterpreter.cpp $(InterpreterSrcDir)/bytecodeInterpreterWithChecks.xml $(InterpreterSrcDir)/bytecodeInterpreterWithChecks.xsl
|
||||
@echo Generating $@
|
||||
@echo $(LOG_INFO) Generating $@
|
||||
$(XSLT) -IN $(InterpreterSrcDir)/bytecodeInterpreterWithChecks.xml -XSL $(InterpreterSrcDir)/bytecodeInterpreterWithChecks.xsl -OUT $(JvmtiOutDir)/bytecodeInterpreterWithChecks.cpp
|
||||
|
||||
$(JvmtiOutDir)/jvmtiEnterTrace.cpp: $(both) $(JvmtiSrcDir)/jvmtiEnter.xsl
|
||||
@echo Generating $@
|
||||
@echo $(LOG_INFO) Generating $@
|
||||
$(XSLT) -IN $(JvmtiSrcDir)/jvmti.xml -XSL $(JvmtiSrcDir)/jvmtiEnter.xsl -OUT $(JvmtiOutDir)/jvmtiEnterTrace.cpp -PARAM interface jvmti -PARAM trace Trace
|
||||
|
||||
$(JvmtiOutDir)/jvmtiEnvRecommended.cpp: $(both) $(JvmtiSrcDir)/jvmtiEnv.xsl $(JvmtiSrcDir)/jvmtiEnv.cpp $(JvmtiEnvFillClass)
|
||||
@echo Generating $@
|
||||
@echo $(LOG_INFO) Generating $@
|
||||
$(XSLT) -IN $(JvmtiSrcDir)/jvmti.xml -XSL $(JvmtiSrcDir)/jvmtiEnv.xsl -OUT $(JvmtiOutDir)/jvmtiEnvStub.cpp
|
||||
$(QUIETLY) $(REMOTE) $(RUN.JAVA) -classpath $(JvmtiOutDir) jvmtiEnvFill $(JvmtiSrcDir)/jvmtiEnv.cpp $(JvmtiOutDir)/jvmtiEnvStub.cpp $(JvmtiOutDir)/jvmtiEnvRecommended.cpp
|
||||
|
||||
$(JvmtiOutDir)/jvmtiEnv.hpp: $(both) $(JvmtiSrcDir)/jvmtiHpp.xsl
|
||||
@echo Generating $@
|
||||
@echo $(LOG_INFO) Generating $@
|
||||
$(XSLT) -IN $(JvmtiSrcDir)/jvmti.xml -XSL $(JvmtiSrcDir)/jvmtiHpp.xsl -OUT $(JvmtiOutDir)/jvmtiEnv.hpp
|
||||
|
||||
$(JvmtiOutDir)/jvmti.h: $(both) $(JvmtiSrcDir)/jvmtiH.xsl
|
||||
@echo Generating $@
|
||||
@echo $(LOG_INFO) Generating $@
|
||||
$(XSLT) -IN $(JvmtiSrcDir)/jvmti.xml -XSL $(JvmtiSrcDir)/jvmtiH.xsl -OUT $(JvmtiOutDir)/jvmti.h
|
||||
|
||||
jvmtidocs: $(JvmtiOutDir)/jvmti.html
|
||||
|
||||
$(JvmtiOutDir)/jvmti.html: $(both) $(JvmtiSrcDir)/jvmti.xsl
|
||||
@echo Generating $@
|
||||
@echo $(LOG_INFO) Generating $@
|
||||
$(XSLT) -IN $(JvmtiSrcDir)/jvmti.xml -XSL $(JvmtiSrcDir)/jvmti.xsl -OUT $(JvmtiOutDir)/jvmti.html
|
||||
|
||||
# #########################################################################
|
||||
@ -115,4 +115,3 @@ cleanall :
|
||||
rm $(JvmtiGenClass) $(JvmtiEnvFillClass) $(JvmtiGeneratedFiles)
|
||||
|
||||
# #########################################################################
|
||||
|
||||
|
||||
@ -146,12 +146,12 @@ include $(GAMMADIR)/make/altsrc.make
|
||||
# The non-PIC object files are only generated for 32 bit platforms.
|
||||
ifdef LP64
|
||||
%.o: %.cpp
|
||||
@echo Compiling $<
|
||||
@echo $(LOG_INFO) Compiling $<
|
||||
$(QUIETLY) $(REMOVE_TARGET)
|
||||
$(QUIETLY) $(COMPILE.CXX) $(DEPFLAGS) -o $@ $< $(COMPILE_DONE)
|
||||
else
|
||||
%.o: %.cpp
|
||||
@echo Compiling $<
|
||||
@echo $(LOG_INFO) Compiling $<
|
||||
$(QUIETLY) $(REMOVE_TARGET)
|
||||
$(QUIETLY) $(if $(findstring $@, $(NONPIC_OBJ_FILES)), \
|
||||
$(subst $(VM_PICFLAG), ,$(COMPILE.CXX)) $(DEPFLAGS) -o $@ $< $(COMPILE_DONE), \
|
||||
@ -159,18 +159,18 @@ else
|
||||
endif
|
||||
|
||||
%.o: %.s
|
||||
@echo Assembling $<
|
||||
@echo $(LOG_INFO) Assembling $<
|
||||
$(QUIETLY) $(REMOVE_TARGET)
|
||||
$(QUIETLY) $(AS.S) $(DEPFLAGS) -o $@ $< $(COMPILE_DONE)
|
||||
|
||||
%.s: %.cpp
|
||||
@echo Generating assembly for $<
|
||||
@echo $(LOG_INFO) Generating assembly for $<
|
||||
$(QUIETLY) $(GENASM.CXX) -o $@ $<
|
||||
$(QUIETLY) $(DEMANGLE) $(COMPILE_DONE)
|
||||
|
||||
# Intermediate files (for debugging macros)
|
||||
%.i: %.cpp
|
||||
@echo Preprocessing $< to $@
|
||||
@echo $(LOG_INFO) Preprocessing $< to $@
|
||||
$(QUIETLY) $(PREPROCESS.CXX) $< > $@ $(COMPILE_DONE)
|
||||
|
||||
# Override gnumake built-in rules which do sccs get operations badly.
|
||||
|
||||
@ -66,7 +66,7 @@ all:
|
||||
fi
|
||||
|
||||
$(GENERATED)/sa-jdi.jar: $(AGENT_FILES)
|
||||
$(QUIETLY) echo "Making $@"
|
||||
$(QUIETLY) echo $(LOG_INFO) "Making $@"
|
||||
$(QUIETLY) if [ "$(BOOT_JAVA_HOME)" = "" ]; then \
|
||||
echo "ALT_BOOTDIR, BOOTDIR or JAVA_HOME needs to be defined to build SA"; \
|
||||
exit 1; \
|
||||
|
||||
@ -73,7 +73,7 @@ $(LIBSAPROC): $(SASRCFILES) $(SAMAPFILE)
|
||||
echo "ALT_BOOTDIR, BOOTDIR or JAVA_HOME needs to be defined to build SA"; \
|
||||
exit 1; \
|
||||
fi
|
||||
@echo Making SA debugger back-end...
|
||||
@echo $(LOG_INFO) Making SA debugger back-end...
|
||||
$(QUIETLY) $(CC) -D$(BUILDARCH) -D_GNU_SOURCE \
|
||||
-D_FILE_OFFSET_BITS=64 \
|
||||
$(SYMFLAG) $(ARCHFLAG) $(SHARED_FLAG) $(PICFLAG) \
|
||||
|
||||
@ -81,7 +81,7 @@ endif
|
||||
all: $(TraceGeneratedFiles)
|
||||
|
||||
GENERATE_CODE= \
|
||||
$(QUIETLY) echo Generating $@; \
|
||||
$(QUIETLY) echo $(LOG_INFO) Generating $@; \
|
||||
$(XSLT) -IN $(word 1,$^) -XSL $(word 2,$^) -OUT $@; \
|
||||
test -f $@
|
||||
|
||||
@ -116,5 +116,3 @@ endif
|
||||
|
||||
clean cleanall:
|
||||
rm $(TraceGeneratedFiles)
|
||||
|
||||
|
||||
|
||||
@ -269,7 +269,7 @@ LFLAGS_VM += -bloadmap:libjvm.loadmap
|
||||
|
||||
# rule for building precompiled header
|
||||
$(PRECOMPILED_HEADER):
|
||||
$(QUIETLY) echo Generating precompiled header $@
|
||||
$(QUIETLY) echo $(LOG_INFO) Generating precompiled header $@
|
||||
$(QUIETLY) mkdir -p $(PRECOMPILED_HEADER_DIR)
|
||||
$(QUIETLY) $(COMPILE.CXX) $(DEPFLAGS) -x c++-header $(PRECOMPILED_HEADER_SRC) -o $@ $(COMPILE_DONE)
|
||||
|
||||
@ -300,7 +300,7 @@ endif
|
||||
# details in bug 6538311.
|
||||
$(LIBJVM): $(LIBJVM.o) $(LIBJVM_MAPFILE) $(LD_SCRIPT)
|
||||
$(QUIETLY) { \
|
||||
echo Linking vm...; \
|
||||
echo $(LOG_INFO) Linking vm...; \
|
||||
$(LINK_LIB.CXX/PRE_HOOK) \
|
||||
$(LINK_VM) $(LD_SCRIPT_FLAG) \
|
||||
$(LFLAGS_VM) -o $@ $(sort $(LIBJVM.o)) $(LIBS_VM); \
|
||||
|
||||
@ -108,7 +108,7 @@ GENERATEDFILES = $(GENERATEDNAMES:%=$(OUTDIR)/%)
|
||||
all: $(EXEC)
|
||||
|
||||
$(EXEC) : $(OBJECTS)
|
||||
@echo Making adlc
|
||||
@echo $(LOG_INFO) Making adlc
|
||||
$(QUIETLY) $(HOST.LINK_NOPROF.CXX) -o $(EXEC) $(OBJECTS)
|
||||
|
||||
# Random dependencies:
|
||||
@ -191,7 +191,7 @@ refresh_adfiles: $(EXEC) $(SOURCE.AD) $(ADLC_UPDATER)
|
||||
$(QUIETLY) ./$(ADLC_UPDATER) adGlobals_$(Platform_arch_model).hpp $(TEMPDIR) $(OUTDIR)
|
||||
$(QUIETLY) ./$(ADLC_UPDATER) dfa_$(Platform_arch_model).cpp $(TEMPDIR) $(OUTDIR)
|
||||
$(QUIETLY) [ -f $(TEMPDIR)/made-change ] \
|
||||
|| echo "Rescanned $(SOURCE.AD) but encountered no changes."
|
||||
|| echo $(LOG_INFO) "Rescanned $(SOURCE.AD) but encountered no changes."
|
||||
$(QUIETLY) rm -rf $(TEMPDIR)
|
||||
|
||||
|
||||
@ -209,14 +209,14 @@ PROCESS_AD_FILES = awk '{ \
|
||||
print }'
|
||||
|
||||
$(OUTDIR)/%.o: %.cpp
|
||||
@echo Compiling $<
|
||||
@echo $(LOG_INFO) Compiling $<
|
||||
$(QUIETLY) $(REMOVE_TARGET)
|
||||
$(QUIETLY) $(HOST.COMPILE.CXX) -o $@ $< $(COMPILE_DONE)
|
||||
|
||||
# Some object files are given a prefix, to disambiguate
|
||||
# them from objects of the same name built for the VM.
|
||||
$(OUTDIR)/adlc-%.o: %.cpp
|
||||
@echo Compiling $<
|
||||
@echo $(LOG_INFO) Compiling $<
|
||||
$(QUIETLY) $(REMOVE_TARGET)
|
||||
$(QUIETLY) $(HOST.COMPILE.CXX) -o $@ $< $(COMPILE_DONE)
|
||||
|
||||
|
||||
@ -201,7 +201,7 @@ DATA_MODE/amd64 = 64
|
||||
DATA_MODE = $(DATA_MODE/$(BUILDARCH))
|
||||
|
||||
flags.make: $(BUILDTREE_MAKE) ../shared_dirs.lst
|
||||
@echo Creating $@ ...
|
||||
@echo $(LOG_INFO) Creating $@ ...
|
||||
$(QUIETLY) ( \
|
||||
$(BUILDTREE_COMMENT); \
|
||||
echo; \
|
||||
@ -286,7 +286,7 @@ flags.make: $(BUILDTREE_MAKE) ../shared_dirs.lst
|
||||
) > $@
|
||||
|
||||
flags_vm.make: $(BUILDTREE_MAKE) ../shared_dirs.lst
|
||||
@echo Creating $@ ...
|
||||
@echo $(LOG_INFO) Creating $@ ...
|
||||
$(QUIETLY) ( \
|
||||
$(BUILDTREE_COMMENT); \
|
||||
echo; \
|
||||
@ -294,7 +294,7 @@ flags_vm.make: $(BUILDTREE_MAKE) ../shared_dirs.lst
|
||||
) > $@
|
||||
|
||||
../shared_dirs.lst: $(BUILDTREE_MAKE) $(GAMMADIR)/src/share/vm
|
||||
@echo Creating directory list $@
|
||||
@echo $(LOG_INFO) Creating directory list $@
|
||||
$(QUIETLY) if [ -d $(HS_ALT_SRC)/share/vm ]; then \
|
||||
find $(HS_ALT_SRC)/share/vm/* -prune \
|
||||
-type d \! \( $(TOPLEVEL_EXCLUDE_DIRS) \) -exec find {} \
|
||||
@ -305,7 +305,7 @@ flags_vm.make: $(BUILDTREE_MAKE) ../shared_dirs.lst
|
||||
\( $(ALWAYS_EXCLUDE_DIRS) \) -prune -o -type d -print \; >> $@
|
||||
|
||||
Makefile: $(BUILDTREE_MAKE)
|
||||
@echo Creating $@ ...
|
||||
@echo $(LOG_INFO) Creating $@ ...
|
||||
$(QUIETLY) ( \
|
||||
$(BUILDTREE_COMMENT); \
|
||||
echo; \
|
||||
@ -315,7 +315,7 @@ Makefile: $(BUILDTREE_MAKE)
|
||||
) > $@
|
||||
|
||||
vm.make: $(BUILDTREE_MAKE)
|
||||
@echo Creating $@ ...
|
||||
@echo $(LOG_INFO) Creating $@ ...
|
||||
$(QUIETLY) ( \
|
||||
$(BUILDTREE_COMMENT); \
|
||||
echo; \
|
||||
@ -326,7 +326,7 @@ vm.make: $(BUILDTREE_MAKE)
|
||||
) > $@
|
||||
|
||||
adlc.make: $(BUILDTREE_MAKE)
|
||||
@echo Creating $@ ...
|
||||
@echo $(LOG_INFO) Creating $@ ...
|
||||
$(QUIETLY) ( \
|
||||
$(BUILDTREE_COMMENT); \
|
||||
echo; \
|
||||
@ -336,7 +336,7 @@ adlc.make: $(BUILDTREE_MAKE)
|
||||
) > $@
|
||||
|
||||
jvmti.make: $(BUILDTREE_MAKE)
|
||||
@echo Creating $@ ...
|
||||
@echo $(LOG_INFO) Creating $@ ...
|
||||
$(QUIETLY) ( \
|
||||
$(BUILDTREE_COMMENT); \
|
||||
echo; \
|
||||
@ -346,7 +346,7 @@ jvmti.make: $(BUILDTREE_MAKE)
|
||||
) > $@
|
||||
|
||||
trace.make: $(BUILDTREE_MAKE)
|
||||
@echo Creating $@ ...
|
||||
@echo $(LOG_INFO) Creating $@ ...
|
||||
$(QUIETLY) ( \
|
||||
$(BUILDTREE_COMMENT); \
|
||||
echo; \
|
||||
@ -356,7 +356,7 @@ trace.make: $(BUILDTREE_MAKE)
|
||||
) > $@
|
||||
|
||||
sa.make: $(BUILDTREE_MAKE)
|
||||
@echo Creating $@ ...
|
||||
@echo $(LOG_INFO) Creating $@ ...
|
||||
$(QUIETLY) ( \
|
||||
$(BUILDTREE_COMMENT); \
|
||||
echo; \
|
||||
@ -366,7 +366,7 @@ sa.make: $(BUILDTREE_MAKE)
|
||||
) > $@
|
||||
|
||||
dtrace.make: $(BUILDTREE_MAKE)
|
||||
@echo Creating $@ ...
|
||||
@echo $(LOG_INFO) Creating $@ ...
|
||||
$(QUIETLY) ( \
|
||||
$(BUILDTREE_COMMENT); \
|
||||
echo; \
|
||||
|
||||
@ -28,6 +28,12 @@
|
||||
|
||||
SLASH_JAVA ?= /java
|
||||
|
||||
define print_info
|
||||
ifneq ($$(LOG_LEVEL), warn)
|
||||
$$(shell echo >&2 "INFO: $1")
|
||||
endif
|
||||
endef
|
||||
|
||||
# Need PLATFORM (os-arch combo names) for jdk and hotspot, plus libarch name
|
||||
ARCH:=$(shell uname -m)
|
||||
PATH_SEP = :
|
||||
@ -187,8 +193,7 @@ ifeq ($(JDK6_OR_EARLIER),0)
|
||||
# debug variants always get Full Debug Symbols (if available)
|
||||
ENABLE_FULL_DEBUG_SYMBOLS = 1
|
||||
endif
|
||||
_JUNK_ := $(shell \
|
||||
echo >&2 "INFO: ENABLE_FULL_DEBUG_SYMBOLS=$(ENABLE_FULL_DEBUG_SYMBOLS)")
|
||||
$(eval $(call print_info, "ENABLE_FULL_DEBUG_SYMBOLS=$(ENABLE_FULL_DEBUG_SYMBOLS)"))
|
||||
# since objcopy is optional, we set ZIP_DEBUGINFO_FILES later
|
||||
|
||||
ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
|
||||
@ -209,22 +214,18 @@ ifeq ($(JDK6_OR_EARLIER),0)
|
||||
endif
|
||||
OBJCOPY=$(shell test -x $(DEF_OBJCOPY) && echo $(DEF_OBJCOPY))
|
||||
ifneq ($(ALT_OBJCOPY),)
|
||||
_JUNK_ := $(shell echo >&2 "INFO: ALT_OBJCOPY=$(ALT_OBJCOPY)")
|
||||
$(eval $(call print_info, "ALT_OBJCOPY=$(ALT_OBJCOPY)"))
|
||||
OBJCOPY=$(shell test -x $(ALT_OBJCOPY) && echo $(ALT_OBJCOPY))
|
||||
endif
|
||||
|
||||
ifeq ($(OBJCOPY),)
|
||||
_JUNK_ := $(shell \
|
||||
echo >&2 "INFO: no objcopy cmd found so cannot create .debuginfo" \
|
||||
"files. You may need to set ALT_OBJCOPY.")
|
||||
$(eval $(call print_info, "no objcopy cmd found so cannot create .debuginfo" \
|
||||
"files. You may need to set ALT_OBJCOPY."))
|
||||
ENABLE_FULL_DEBUG_SYMBOLS=0
|
||||
_JUNK_ := $(shell \
|
||||
echo >&2 "INFO:" \
|
||||
"ENABLE_FULL_DEBUG_SYMBOLS=$(ENABLE_FULL_DEBUG_SYMBOLS)")
|
||||
$(eval $(call print_info, "ENABLE_FULL_DEBUG_SYMBOLS=$(ENABLE_FULL_DEBUG_SYMBOLS)"))
|
||||
else
|
||||
_JUNK_ := $(shell \
|
||||
echo >&2 "INFO: $(OBJCOPY) cmd found so will create .debuginfo" \
|
||||
"files.")
|
||||
$(eval $(call print_info, "$(OBJCOPY) cmd found so will create .debuginfo" \
|
||||
"files."))
|
||||
|
||||
# Library stripping policies for .debuginfo configs:
|
||||
# all_strip - strips everything from the library
|
||||
@ -241,14 +242,12 @@ ifeq ($(JDK6_OR_EARLIER),0)
|
||||
#
|
||||
STRIP_POLICY ?= min_strip
|
||||
|
||||
_JUNK_ := $(shell \
|
||||
echo >&2 "INFO: STRIP_POLICY=$(STRIP_POLICY)")
|
||||
$(eval $(call print_info, "STRIP_POLICY=$(STRIP_POLICY)"))
|
||||
|
||||
ZIP_DEBUGINFO_FILES ?= 1
|
||||
endif
|
||||
|
||||
_JUNK_ := $(shell \
|
||||
echo >&2 "INFO: ZIP_DEBUGINFO_FILES=$(ZIP_DEBUGINFO_FILES)")
|
||||
$(eval $(call print_info, "ZIP_DEBUGINFO_FILES=$(ZIP_DEBUGINFO_FILES)"))
|
||||
endif
|
||||
endif # ENABLE_FULL_DEBUG_SYMBOLS=1
|
||||
endif # BUILD_FLAVOR
|
||||
|
||||
@ -92,7 +92,7 @@ XLIBJVM_DTRACE_DEBUGINFO = $(XLIBJVM_DIR)/$(LIBJVM_DTRACE_DEBUGINFO)
|
||||
XLIBJVM_DTRACE_DIZ = $(XLIBJVM_DIR)/$(LIBJVM_DTRACE_DIZ)
|
||||
|
||||
$(XLIBJVM_DB): $(DTRACE_SRCDIR)/$(JVM_DB).c $(JVMOFFS).h $(LIBJVM_DB_MAPFILE)
|
||||
@echo Making $@
|
||||
@echo $(LOG_INFO) Making $@
|
||||
$(QUIETLY) mkdir -p $(XLIBJVM_DIR) ; \
|
||||
$(CC) $(SYMFLAG) -xarch=$(XARCH) -D$(TYPE) -I. -I$(GENERATED) \
|
||||
$(SHARED_FLAG) $(LFLAGS_JVM_DB) -o $@ $(DTRACE_SRCDIR)/$(JVM_DB).c #-lc
|
||||
@ -128,7 +128,7 @@ ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
|
||||
endif
|
||||
|
||||
$(XLIBJVM_DTRACE): $(DTRACE_SRCDIR)/$(JVM_DTRACE).c $(DTRACE_SRCDIR)/$(JVM_DTRACE).h $(LIBJVM_DTRACE_MAPFILE)
|
||||
@echo Making $@
|
||||
@echo $(LOG_INFO) Making $@
|
||||
$(QUIETLY) mkdir -p $(XLIBJVM_DIR) ; \
|
||||
$(CC) $(SYMFLAG) -xarch=$(XARCH) -D$(TYPE) -I. \
|
||||
$(SHARED_FLAG) $(LFLAGS_JVM_DTRACE) -o $@ $(DTRACE_SRCDIR)/$(JVM_DTRACE).c #-lc -lthread -ldoor
|
||||
@ -202,7 +202,7 @@ $(JVMOFFS.o): $(JVMOFFS).h $(JVMOFFS).cpp
|
||||
$(QUIETLY) $(CXX) -c -I. -o $@ $(ARCHFLAG) -D$(TYPE) $(JVMOFFS).cpp
|
||||
|
||||
$(LIBJVM_DB): $(DTRACE_SRCDIR)/$(JVM_DB).c $(JVMOFFS.o) $(XLIBJVM_DB) $(LIBJVM_DB_MAPFILE)
|
||||
@echo Making $@
|
||||
@echo $(LOG_INFO) Making $@
|
||||
$(QUIETLY) $(CC) $(SYMFLAG) $(ARCHFLAG) -D$(TYPE) -I. -I$(GENERATED) \
|
||||
$(SHARED_FLAG) $(LFLAGS_JVM_DB) -o $@ $(DTRACE_SRCDIR)/$(JVM_DB).c -Wall # -lc
|
||||
ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
|
||||
@ -231,7 +231,7 @@ ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
|
||||
endif
|
||||
|
||||
$(LIBJVM_DTRACE): $(DTRACE_SRCDIR)/$(JVM_DTRACE).c $(XLIBJVM_DTRACE) $(DTRACE_SRCDIR)/$(JVM_DTRACE).h $(LIBJVM_DTRACE_MAPFILE)
|
||||
@echo Making $@
|
||||
@echo $(LOG_INFO) Making $@
|
||||
$(QUIETLY) $(CC) $(SYMFLAG) $(ARCHFLAG) -D$(TYPE) -I. \
|
||||
$(SHARED_FLAG) $(LFLAGS_JVM_DTRACE) -o $@ $(DTRACE_SRCDIR)/$(JVM_DTRACE).c #-lc -lthread -ldoor
|
||||
ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
|
||||
@ -296,13 +296,13 @@ CFLAGS += -DDTRACE_ENABLED #$(DTRACE_INCL)
|
||||
dtraceCheck:
|
||||
|
||||
dtrace_stuff: dtrace_gen_headers
|
||||
$(QUIETLY) echo "dtrace headers generated"
|
||||
$(QUIETLY) echo $(LOG_INFO) "dtrace headers generated"
|
||||
|
||||
|
||||
else # manually disabled
|
||||
|
||||
dtraceCheck:
|
||||
$(QUIETLY) echo "**NOTICE** Dtrace support disabled via environment variable"
|
||||
$(QUIETLY) echo $(LOG_INFO) "**NOTICE** Dtrace support disabled via environment variable"
|
||||
|
||||
dtrace_stuff:
|
||||
|
||||
@ -311,7 +311,7 @@ endif # ifeq ("${HOTSPOT_DISABLE_DTRACE_PROBES}", "")
|
||||
else # No dtrace program found
|
||||
|
||||
dtraceCheck:
|
||||
$(QUIETLY) echo "**NOTICE** Dtrace support disabled: not supported by system"
|
||||
$(QUIETLY) echo $(LOG_INFO) "**NOTICE** Dtrace support disabled: not supported by system"
|
||||
|
||||
dtrace_stuff:
|
||||
|
||||
@ -323,6 +323,6 @@ endif # ifeq ($(OS_VENDOR), Darwin)
|
||||
else # CORE build
|
||||
|
||||
dtraceCheck:
|
||||
$(QUIETLY) echo "**NOTICE** Dtrace support disabled for CORE builds"
|
||||
$(QUIETLY) echo $(LOG_INFO) "**NOTICE** Dtrace support disabled for CORE builds"
|
||||
|
||||
endif # ifneq ("${TYPE}", "CORE")
|
||||
|
||||
@ -60,7 +60,7 @@ ifeq ($(DEBUG_BINARIES), true)
|
||||
endif
|
||||
|
||||
$(LIBJSIG): $(JSIGSRCDIR)/jsig.c $(LIBJSIG_MAPFILE)
|
||||
@echo Making signal interposition lib...
|
||||
@echo $(LOG_INFO) Making signal interposition lib...
|
||||
$(QUIETLY) $(CC) $(SYMFLAG) $(ARCHFLAG) $(SHARED_FLAG) $(PICFLAG) \
|
||||
$(LFLAGS_JSIG) $(JSIG_DEBUG_CFLAGS) -o $@ $<
|
||||
ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
|
||||
|
||||
@ -75,34 +75,34 @@ $(JvmtiEnvFillClass): $(JvmtiEnvFillSource)
|
||||
$(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -d $(JvmtiOutDir) $(JvmtiEnvFillSource)
|
||||
|
||||
$(JvmtiOutDir)/jvmtiEnter.cpp: $(both) $(JvmtiSrcDir)/jvmtiEnter.xsl
|
||||
@echo Generating $@
|
||||
@echo $(LOG_INFO) Generating $@
|
||||
$(XSLT) -IN $(JvmtiSrcDir)/jvmti.xml -XSL $(JvmtiSrcDir)/jvmtiEnter.xsl -OUT $(JvmtiOutDir)/jvmtiEnter.cpp -PARAM interface jvmti
|
||||
|
||||
$(JvmtiOutDir)/bytecodeInterpreterWithChecks.cpp: $(JvmtiGenClass) $(InterpreterSrcDir)/bytecodeInterpreter.cpp $(InterpreterSrcDir)/bytecodeInterpreterWithChecks.xml $(InterpreterSrcDir)/bytecodeInterpreterWithChecks.xsl
|
||||
@echo Generating $@
|
||||
@echo $(LOG_INFO) Generating $@
|
||||
$(XSLT) -IN $(InterpreterSrcDir)/bytecodeInterpreterWithChecks.xml -XSL $(InterpreterSrcDir)/bytecodeInterpreterWithChecks.xsl -OUT $(JvmtiOutDir)/bytecodeInterpreterWithChecks.cpp
|
||||
|
||||
$(JvmtiOutDir)/jvmtiEnterTrace.cpp: $(both) $(JvmtiSrcDir)/jvmtiEnter.xsl
|
||||
@echo Generating $@
|
||||
@echo $(LOG_INFO) Generating $@
|
||||
$(XSLT) -IN $(JvmtiSrcDir)/jvmti.xml -XSL $(JvmtiSrcDir)/jvmtiEnter.xsl -OUT $(JvmtiOutDir)/jvmtiEnterTrace.cpp -PARAM interface jvmti -PARAM trace Trace
|
||||
|
||||
$(JvmtiOutDir)/jvmtiEnvRecommended.cpp: $(both) $(JvmtiSrcDir)/jvmtiEnv.xsl $(JvmtiSrcDir)/jvmtiEnv.cpp $(JvmtiEnvFillClass)
|
||||
@echo Generating $@
|
||||
@echo $(LOG_INFO) Generating $@
|
||||
$(XSLT) -IN $(JvmtiSrcDir)/jvmti.xml -XSL $(JvmtiSrcDir)/jvmtiEnv.xsl -OUT $(JvmtiOutDir)/jvmtiEnvStub.cpp
|
||||
$(QUIETLY) $(REMOTE) $(RUN.JAVA) -classpath $(JvmtiOutDir) jvmtiEnvFill $(JvmtiSrcDir)/jvmtiEnv.cpp $(JvmtiOutDir)/jvmtiEnvStub.cpp $(JvmtiOutDir)/jvmtiEnvRecommended.cpp
|
||||
|
||||
$(JvmtiOutDir)/jvmtiEnv.hpp: $(both) $(JvmtiSrcDir)/jvmtiHpp.xsl
|
||||
@echo Generating $@
|
||||
@echo $(LOG_INFO) Generating $@
|
||||
$(XSLT) -IN $(JvmtiSrcDir)/jvmti.xml -XSL $(JvmtiSrcDir)/jvmtiHpp.xsl -OUT $(JvmtiOutDir)/jvmtiEnv.hpp
|
||||
|
||||
$(JvmtiOutDir)/jvmti.h: $(both) $(JvmtiSrcDir)/jvmtiH.xsl
|
||||
@echo Generating $@
|
||||
@echo $(LOG_INFO) Generating $@
|
||||
$(XSLT) -IN $(JvmtiSrcDir)/jvmti.xml -XSL $(JvmtiSrcDir)/jvmtiH.xsl -OUT $(JvmtiOutDir)/jvmti.h
|
||||
|
||||
jvmtidocs: $(JvmtiOutDir)/jvmti.html
|
||||
|
||||
$(JvmtiOutDir)/jvmti.html: $(both) $(JvmtiSrcDir)/jvmti.xsl
|
||||
@echo Generating $@
|
||||
@echo $(LOG_INFO) Generating $@
|
||||
$(XSLT) -IN $(JvmtiSrcDir)/jvmti.xml -XSL $(JvmtiSrcDir)/jvmti.xsl -OUT $(JvmtiOutDir)/jvmti.html
|
||||
|
||||
# #########################################################################
|
||||
@ -114,4 +114,3 @@ cleanall :
|
||||
rm $(JvmtiGenClass) $(JvmtiEnvFillClass) $(JvmtiGeneratedFiles)
|
||||
|
||||
# #########################################################################
|
||||
|
||||
|
||||
@ -146,12 +146,12 @@ include $(GAMMADIR)/make/altsrc.make
|
||||
# The non-PIC object files are only generated for 32 bit platforms.
|
||||
ifdef LP64
|
||||
%.o: %.cpp
|
||||
@echo Compiling $<
|
||||
@echo $(LOG_INFO) Compiling $<
|
||||
$(QUIETLY) $(REMOVE_TARGET)
|
||||
$(QUIETLY) $(COMPILE.CXX) $(DEPFLAGS) -o $@ $< $(COMPILE_DONE)
|
||||
else
|
||||
%.o: %.cpp
|
||||
@echo Compiling $<
|
||||
@echo $(LOG_INFO) Compiling $<
|
||||
$(QUIETLY) $(REMOVE_TARGET)
|
||||
$(QUIETLY) $(if $(findstring $@, $(NONPIC_OBJ_FILES)), \
|
||||
$(subst $(VM_PICFLAG), ,$(COMPILE.CXX)) $(DEPFLAGS) -o $@ $< $(COMPILE_DONE), \
|
||||
@ -159,18 +159,18 @@ else
|
||||
endif
|
||||
|
||||
%.o: %.s
|
||||
@echo Assembling $<
|
||||
@echo $(LOG_INFO) Assembling $<
|
||||
$(QUIETLY) $(REMOVE_TARGET)
|
||||
$(QUIETLY) $(AS.S) $(DEPFLAGS) -o $@ $< $(COMPILE_DONE)
|
||||
|
||||
%.s: %.cpp
|
||||
@echo Generating assembly for $<
|
||||
@echo $(LOG_INFO) Generating assembly for $<
|
||||
$(QUIETLY) $(GENASM.CXX) -o $@ $<
|
||||
$(QUIETLY) $(DEMANGLE) $(COMPILE_DONE)
|
||||
|
||||
# Intermediate files (for debugging macros)
|
||||
%.i: %.cpp
|
||||
@echo Preprocessing $< to $@
|
||||
@echo $(LOG_INFO) Preprocessing $< to $@
|
||||
$(QUIETLY) $(PREPROCESS.CXX) $< > $@ $(COMPILE_DONE)
|
||||
|
||||
# Override gnumake built-in rules which do sccs get operations badly.
|
||||
|
||||
@ -25,6 +25,12 @@
|
||||
# This makefile (sa.make) is included from the sa.make in the
|
||||
# build directories.
|
||||
|
||||
define print_info
|
||||
ifneq ($$(LOG_LEVEL), warn)
|
||||
$$(shell echo >&2 "INFO: $1")
|
||||
endif
|
||||
endef
|
||||
|
||||
# This makefile is used to build Serviceability Agent java code
|
||||
# and generate JNI header file for native methods.
|
||||
|
||||
@ -53,7 +59,7 @@ ifeq ($(ALT_SA_CLASSPATH),)
|
||||
endif
|
||||
endif
|
||||
else
|
||||
_JUNK_ := $(shell echo >&2 "INFO: ALT_SA_CLASSPATH=$(ALT_SA_CLASSPATH)")
|
||||
$(eval $(call print_info, "ALT_SA_CLASSPATH=$(ALT_SA_CLASSPATH)"))
|
||||
SA_CLASSPATH=$(shell test -f $(ALT_SA_CLASSPATH) && echo $(ALT_SA_CLASSPATH))
|
||||
endif
|
||||
|
||||
@ -80,7 +86,7 @@ all:
|
||||
fi
|
||||
|
||||
$(GENERATED)/sa-jdi.jar: $(AGENT_FILES)
|
||||
$(QUIETLY) echo "Making $@"
|
||||
$(QUIETLY) echo $(LOG_INFO) "Making $@"
|
||||
$(QUIETLY) if [ "$(BOOT_JAVA_HOME)" = "" ]; then \
|
||||
echo "ALT_BOOTDIR, BOOTDIR or JAVA_HOME needs to be defined to build SA"; \
|
||||
exit 1; \
|
||||
|
||||
@ -122,7 +122,7 @@ $(LIBSAPROC): $(SASRCFILES) $(SAMAPFILE)
|
||||
echo "ALT_BOOTDIR, BOOTDIR or JAVA_HOME needs to be defined to build SA"; \
|
||||
exit 1; \
|
||||
fi
|
||||
@echo Making SA debugger back-end...
|
||||
@echo $(LOG_INFO) Making SA debugger back-end...
|
||||
$(QUIETLY) $(CC) -D$(BUILDARCH) -D_GNU_SOURCE \
|
||||
$(SA_SYSROOT_FLAGS) \
|
||||
$(SYMFLAG) $(SAARCH) $(SHARED_FLAG) $(PICFLAG) \
|
||||
|
||||
@ -82,7 +82,7 @@ endif
|
||||
all: $(TraceGeneratedFiles)
|
||||
|
||||
GENERATE_CODE= \
|
||||
$(QUIETLY) echo Generating $@; \
|
||||
$(QUIETLY) echo $(LOG_INFO) Generating $@; \
|
||||
$(XSLT) -IN $(word 1,$^) -XSL $(word 2,$^) -OUT $@; \
|
||||
test -f $@
|
||||
|
||||
@ -118,4 +118,3 @@ endif
|
||||
|
||||
clean cleanall:
|
||||
rm $(TraceGeneratedFiles)
|
||||
|
||||
|
||||
@ -291,7 +291,7 @@ endif
|
||||
|
||||
# rule for building precompiled header
|
||||
$(PRECOMPILED_HEADER):
|
||||
$(QUIETLY) echo Generating precompiled header $@
|
||||
$(QUIETLY) echo $(LOG_INFO) Generating precompiled header $@
|
||||
$(QUIETLY) mkdir -p $(PRECOMPILED_HEADER_DIR)
|
||||
$(QUIETLY) rm -f $@
|
||||
$(QUIETLY) $(COMPILE.CXX) $(DEPFLAGS) -x c++-header $(PRECOMPILED_HEADER_SRC) -o $@ $(COMPILE_DONE)
|
||||
@ -318,7 +318,7 @@ endif
|
||||
|
||||
$(LIBJVM): $(LIBJVM.o) $(LIBJVM_MAPFILE) $(LD_SCRIPT)
|
||||
$(QUIETLY) { \
|
||||
echo Linking vm...; \
|
||||
echo $(LOG_INFO) Linking vm...; \
|
||||
$(LINK_LIB.CXX/PRE_HOOK) \
|
||||
$(LINK_VM) $(LD_SCRIPT_FLAG) \
|
||||
$(LFLAGS_VM) -o $@ $(sort $(LIBJVM.o)) $(LIBS_VM); \
|
||||
|
||||
@ -29,6 +29,12 @@ ifneq ($(SPEC),)
|
||||
include $(SPEC)
|
||||
endif
|
||||
|
||||
ifeq ($(LOG_LEVEL),warn)
|
||||
LOG_INFO := > /dev/null
|
||||
else
|
||||
LOG_INFO :=
|
||||
endif
|
||||
|
||||
# Directory paths and user name
|
||||
# Unless GAMMADIR is set on the command line, search upward from
|
||||
# the current directory for a parent directory containing "src/share/vm".
|
||||
|
||||
@ -106,7 +106,7 @@ GENERATEDFILES = $(GENERATEDNAMES:%=$(OUTDIR)/%)
|
||||
all: $(EXEC)
|
||||
|
||||
$(EXEC) : $(OBJECTS)
|
||||
@echo Making adlc
|
||||
@echo $(LOG_INFO) Making adlc
|
||||
$(QUIETLY) $(filter-out $(ARCHFLAG),$(HOST.LINK_NOPROF.CXX)) -o $(EXEC) $(OBJECTS)
|
||||
|
||||
# Random dependencies:
|
||||
@ -191,7 +191,7 @@ refresh_adfiles: $(EXEC) $(SOURCE.AD) $(ADLC_UPDATER)
|
||||
$(QUIETLY) ./$(ADLC_UPDATER) adGlobals_$(Platform_arch_model).hpp $(TEMPDIR) $(OUTDIR)
|
||||
$(QUIETLY) ./$(ADLC_UPDATER) dfa_$(Platform_arch_model).cpp $(TEMPDIR) $(OUTDIR)
|
||||
$(QUIETLY) [ -f $(TEMPDIR)/made-change ] \
|
||||
|| echo "Rescanned $(SOURCE.AD) but encountered no changes."
|
||||
|| echo $(LOG_INFO) "Rescanned $(SOURCE.AD) but encountered no changes."
|
||||
$(QUIETLY) rm -rf $(TEMPDIR)
|
||||
|
||||
|
||||
@ -209,14 +209,14 @@ PROCESS_AD_FILES = awk '{ \
|
||||
print }'
|
||||
|
||||
$(OUTDIR)/%.o: %.cpp
|
||||
@echo Compiling $<
|
||||
@echo $(LOG_INFO) Compiling $<
|
||||
$(QUIETLY) $(REMOVE_TARGET)
|
||||
$(QUIETLY) $(filter-out $(ARCHFLAG),$(HOST.COMPILE.CXX)) -o $@ $< $(COMPILE_DONE)
|
||||
|
||||
# Some object files are given a prefix, to disambiguate
|
||||
# them from objects of the same name built for the VM.
|
||||
$(OUTDIR)/adlc-%.o: %.cpp
|
||||
@echo Compiling $<
|
||||
@echo $(LOG_INFO) Compiling $<
|
||||
$(QUIETLY) $(REMOVE_TARGET)
|
||||
$(QUIETLY) $(filter-out $(ARCHFLAG),$(HOST.COMPILE.CXX)) -o $@ $< $(COMPILE_DONE)
|
||||
|
||||
|
||||
@ -198,7 +198,7 @@ DATA_MODE/ppc64 = 64
|
||||
DATA_MODE = $(DATA_MODE/$(BUILDARCH))
|
||||
|
||||
flags.make: $(BUILDTREE_MAKE) ../shared_dirs.lst
|
||||
@echo Creating $@ ...
|
||||
@echo $(LOG_INFO) Creating $@ ...
|
||||
$(QUIETLY) ( \
|
||||
$(BUILDTREE_COMMENT); \
|
||||
echo; \
|
||||
@ -285,7 +285,7 @@ flags.make: $(BUILDTREE_MAKE) ../shared_dirs.lst
|
||||
) > $@
|
||||
|
||||
flags_vm.make: $(BUILDTREE_MAKE) ../shared_dirs.lst
|
||||
@echo Creating $@ ...
|
||||
@echo $(LOG_INFO) Creating $@ ...
|
||||
$(QUIETLY) ( \
|
||||
$(BUILDTREE_COMMENT); \
|
||||
echo; \
|
||||
@ -293,7 +293,7 @@ flags_vm.make: $(BUILDTREE_MAKE) ../shared_dirs.lst
|
||||
) > $@
|
||||
|
||||
../shared_dirs.lst: $(BUILDTREE_MAKE) $(GAMMADIR)/src/share/vm
|
||||
@echo Creating directory list $@
|
||||
@echo $(LOG_INFO) Creating directory list $@
|
||||
$(QUIETLY) if [ -d $(HS_ALT_SRC)/share/vm ]; then \
|
||||
find $(HS_ALT_SRC)/share/vm/* -prune \
|
||||
-type d \! \( $(TOPLEVEL_EXCLUDE_DIRS) \) -exec find {} \
|
||||
@ -304,7 +304,7 @@ flags_vm.make: $(BUILDTREE_MAKE) ../shared_dirs.lst
|
||||
\( $(ALWAYS_EXCLUDE_DIRS) \) -prune -o -type d -print \; >> $@
|
||||
|
||||
Makefile: $(BUILDTREE_MAKE)
|
||||
@echo Creating $@ ...
|
||||
@echo $(LOG_INFO) Creating $@ ...
|
||||
$(QUIETLY) ( \
|
||||
$(BUILDTREE_COMMENT); \
|
||||
echo; \
|
||||
@ -314,7 +314,7 @@ Makefile: $(BUILDTREE_MAKE)
|
||||
) > $@
|
||||
|
||||
vm.make: $(BUILDTREE_MAKE)
|
||||
@echo Creating $@ ...
|
||||
@echo $(LOG_INFO) Creating $@ ...
|
||||
$(QUIETLY) ( \
|
||||
$(BUILDTREE_COMMENT); \
|
||||
echo; \
|
||||
@ -325,7 +325,7 @@ vm.make: $(BUILDTREE_MAKE)
|
||||
) > $@
|
||||
|
||||
adlc.make: $(BUILDTREE_MAKE)
|
||||
@echo Creating $@ ...
|
||||
@echo $(LOG_INFO) Creating $@ ...
|
||||
$(QUIETLY) ( \
|
||||
$(BUILDTREE_COMMENT); \
|
||||
echo; \
|
||||
@ -335,7 +335,7 @@ adlc.make: $(BUILDTREE_MAKE)
|
||||
) > $@
|
||||
|
||||
jvmti.make: $(BUILDTREE_MAKE)
|
||||
@echo Creating $@ ...
|
||||
@echo $(LOG_INFO) Creating $@ ...
|
||||
$(QUIETLY) ( \
|
||||
$(BUILDTREE_COMMENT); \
|
||||
echo; \
|
||||
@ -345,7 +345,7 @@ jvmti.make: $(BUILDTREE_MAKE)
|
||||
) > $@
|
||||
|
||||
trace.make: $(BUILDTREE_MAKE)
|
||||
@echo Creating $@ ...
|
||||
@echo $(LOG_INFO) Creating $@ ...
|
||||
$(QUIETLY) ( \
|
||||
$(BUILDTREE_COMMENT); \
|
||||
echo; \
|
||||
@ -355,7 +355,7 @@ trace.make: $(BUILDTREE_MAKE)
|
||||
) > $@
|
||||
|
||||
sa.make: $(BUILDTREE_MAKE)
|
||||
@echo Creating $@ ...
|
||||
@echo $(LOG_INFO) Creating $@ ...
|
||||
$(QUIETLY) ( \
|
||||
$(BUILDTREE_COMMENT); \
|
||||
echo; \
|
||||
@ -365,7 +365,7 @@ sa.make: $(BUILDTREE_MAKE)
|
||||
) > $@
|
||||
|
||||
dtrace.make: $(BUILDTREE_MAKE)
|
||||
@echo Creating $@ ...
|
||||
@echo $(LOG_INFO) Creating $@ ...
|
||||
$(QUIETLY) ( \
|
||||
$(BUILDTREE_COMMENT); \
|
||||
echo; \
|
||||
|
||||
@ -28,6 +28,12 @@
|
||||
|
||||
SLASH_JAVA ?= /java
|
||||
|
||||
define print_info
|
||||
ifneq ($$(LOG_LEVEL), warn)
|
||||
$$(shell echo >&2 "INFO: $1")
|
||||
endif
|
||||
endef
|
||||
|
||||
# Need PLATFORM (os-arch combo names) for jdk and hotspot, plus libarch name
|
||||
|
||||
# ARCH can be set explicitly in spec.gmk
|
||||
@ -185,8 +191,7 @@ ifeq ($(JDK6_OR_EARLIER),0)
|
||||
# debug variants always get Full Debug Symbols (if available)
|
||||
ENABLE_FULL_DEBUG_SYMBOLS = 1
|
||||
endif
|
||||
_JUNK_ := $(shell \
|
||||
echo >&2 "INFO: ENABLE_FULL_DEBUG_SYMBOLS=$(ENABLE_FULL_DEBUG_SYMBOLS)")
|
||||
$(eval $(call print_info, "ENABLE_FULL_DEBUG_SYMBOLS=$(ENABLE_FULL_DEBUG_SYMBOLS)"))
|
||||
# since objcopy is optional, we set ZIP_DEBUGINFO_FILES later
|
||||
|
||||
ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
|
||||
@ -201,19 +206,16 @@ ifeq ($(JDK6_OR_EARLIER),0)
|
||||
endif
|
||||
OBJCOPY=$(shell test -x $(DEF_OBJCOPY) && echo $(DEF_OBJCOPY))
|
||||
ifneq ($(ALT_OBJCOPY),)
|
||||
_JUNK_ := $(shell echo >&2 "INFO: ALT_OBJCOPY=$(ALT_OBJCOPY)")
|
||||
$(eval $(call print_info, "ALT_OBJCOPY=$(ALT_OBJCOPY)"))
|
||||
OBJCOPY=$(shell test -x $(ALT_OBJCOPY) && echo $(ALT_OBJCOPY))
|
||||
endif
|
||||
|
||||
ifeq ($(OBJCOPY),)
|
||||
_JUNK_ := $(shell \
|
||||
echo >&2 "INFO: no objcopy cmd found so cannot create .debuginfo files. You may need to set ALT_OBJCOPY.")
|
||||
$(eval $(call print_info, "no objcopy cmd found so cannot create .debuginfo files. You may need to set ALT_OBJCOPY."))
|
||||
ENABLE_FULL_DEBUG_SYMBOLS=0
|
||||
_JUNK_ := $(shell \
|
||||
echo >&2 "INFO: ENABLE_FULL_DEBUG_SYMBOLS=$(ENABLE_FULL_DEBUG_SYMBOLS)")
|
||||
$(eval $(call print_info, "ENABLE_FULL_DEBUG_SYMBOLS=$(ENABLE_FULL_DEBUG_SYMBOLS)"))
|
||||
else
|
||||
_JUNK_ := $(shell \
|
||||
echo >&2 "INFO: $(OBJCOPY) cmd found so will create .debuginfo files.")
|
||||
$(eval $(call print_info, "$(OBJCOPY) cmd found so will create .debuginfo files."))
|
||||
|
||||
# Library stripping policies for .debuginfo configs:
|
||||
# all_strip - strips everything from the library
|
||||
@ -227,13 +229,11 @@ ifeq ($(JDK6_OR_EARLIER),0)
|
||||
#
|
||||
STRIP_POLICY ?= min_strip
|
||||
|
||||
_JUNK_ := $(shell \
|
||||
echo >&2 "INFO: STRIP_POLICY=$(STRIP_POLICY)")
|
||||
$(eval $(call print_info, "STRIP_POLICY=$(STRIP_POLICY)"))
|
||||
|
||||
ZIP_DEBUGINFO_FILES ?= 1
|
||||
|
||||
_JUNK_ := $(shell \
|
||||
echo >&2 "INFO: ZIP_DEBUGINFO_FILES=$(ZIP_DEBUGINFO_FILES)")
|
||||
$(eval $(call print_info, "ZIP_DEBUGINFO_FILES=$(ZIP_DEBUGINFO_FILES)"))
|
||||
endif
|
||||
endif # ENABLE_FULL_DEBUG_SYMBOLS=1
|
||||
endif # BUILD_FLAVOR
|
||||
|
||||
@ -78,13 +78,13 @@ CFLAGS += -DDTRACE_ENABLED
|
||||
dtrace_gen_headers: $(DtraceOutDir)/hotspot.h $(DtraceOutDir)/hotspot_jni.h $(DtraceOutDir)/hs_private.h
|
||||
else
|
||||
dtrace_gen_headers:
|
||||
$(QUIETLY) echo "**NOTICE** Dtrace support disabled: $(REASON)"
|
||||
$(QUIETLY) $(LOG_INFO) echo "**NOTICE** Dtrace support disabled: $(REASON)"
|
||||
endif
|
||||
|
||||
# Phony target used in vm.make build target to check whether enabled.
|
||||
ifeq ($(DTRACE_ENABLED),)
|
||||
dtraceCheck:
|
||||
$(QUIETLY) echo "**NOTICE** Dtrace support disabled: $(REASON)"
|
||||
$(QUIETLY) $(LOG_INFO) echo "**NOTICE** Dtrace support disabled: $(REASON)"
|
||||
else
|
||||
dtraceCheck:
|
||||
endif
|
||||
|
||||
@ -52,7 +52,7 @@ ifeq ($(DEBUG_BINARIES), true)
|
||||
endif
|
||||
|
||||
$(LIBJSIG): $(JSIGSRCDIR)/jsig.c $(LIBJSIG_MAPFILE)
|
||||
@echo Making signal interposition lib...
|
||||
@echo $(LOG_INFO) Making signal interposition lib...
|
||||
$(QUIETLY) $(CC) $(SYMFLAG) $(ARCHFLAG) $(SHARED_FLAG) $(PICFLAG) \
|
||||
$(LFLAGS_JSIG) $(JSIG_DEBUG_CFLAGS) $(EXTRA_CFLAGS) -o $@ $< -ldl
|
||||
ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
|
||||
|
||||
@ -75,34 +75,34 @@ $(JvmtiEnvFillClass): $(JvmtiEnvFillSource)
|
||||
$(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -d $(JvmtiOutDir) $(JvmtiEnvFillSource)
|
||||
|
||||
$(JvmtiOutDir)/jvmtiEnter.cpp: $(both) $(JvmtiSrcDir)/jvmtiEnter.xsl
|
||||
@echo Generating $@
|
||||
@echo $(LOG_INFO) Generating $@
|
||||
$(XSLT) -IN $(JvmtiSrcDir)/jvmti.xml -XSL $(JvmtiSrcDir)/jvmtiEnter.xsl -OUT $(JvmtiOutDir)/jvmtiEnter.cpp -PARAM interface jvmti
|
||||
|
||||
$(JvmtiOutDir)/bytecodeInterpreterWithChecks.cpp: $(JvmtiGenClass) $(InterpreterSrcDir)/bytecodeInterpreter.cpp $(InterpreterSrcDir)/bytecodeInterpreterWithChecks.xml $(InterpreterSrcDir)/bytecodeInterpreterWithChecks.xsl
|
||||
@echo Generating $@
|
||||
@echo $(LOG_INFO) Generating $@
|
||||
$(XSLT) -IN $(InterpreterSrcDir)/bytecodeInterpreterWithChecks.xml -XSL $(InterpreterSrcDir)/bytecodeInterpreterWithChecks.xsl -OUT $(JvmtiOutDir)/bytecodeInterpreterWithChecks.cpp
|
||||
|
||||
$(JvmtiOutDir)/jvmtiEnterTrace.cpp: $(both) $(JvmtiSrcDir)/jvmtiEnter.xsl
|
||||
@echo Generating $@
|
||||
@echo $(LOG_INFO) Generating $@
|
||||
$(XSLT) -IN $(JvmtiSrcDir)/jvmti.xml -XSL $(JvmtiSrcDir)/jvmtiEnter.xsl -OUT $(JvmtiOutDir)/jvmtiEnterTrace.cpp -PARAM interface jvmti -PARAM trace Trace
|
||||
|
||||
$(JvmtiOutDir)/jvmtiEnvRecommended.cpp: $(both) $(JvmtiSrcDir)/jvmtiEnv.xsl $(JvmtiSrcDir)/jvmtiEnv.cpp $(JvmtiEnvFillClass)
|
||||
@echo Generating $@
|
||||
@echo $(LOG_INFO) Generating $@
|
||||
$(XSLT) -IN $(JvmtiSrcDir)/jvmti.xml -XSL $(JvmtiSrcDir)/jvmtiEnv.xsl -OUT $(JvmtiOutDir)/jvmtiEnvStub.cpp
|
||||
$(QUIETLY) $(REMOTE) $(RUN.JAVA) -classpath $(JvmtiOutDir) jvmtiEnvFill $(JvmtiSrcDir)/jvmtiEnv.cpp $(JvmtiOutDir)/jvmtiEnvStub.cpp $(JvmtiOutDir)/jvmtiEnvRecommended.cpp
|
||||
|
||||
$(JvmtiOutDir)/jvmtiEnv.hpp: $(both) $(JvmtiSrcDir)/jvmtiHpp.xsl
|
||||
@echo Generating $@
|
||||
@echo $(LOG_INFO) Generating $@
|
||||
$(XSLT) -IN $(JvmtiSrcDir)/jvmti.xml -XSL $(JvmtiSrcDir)/jvmtiHpp.xsl -OUT $(JvmtiOutDir)/jvmtiEnv.hpp
|
||||
|
||||
$(JvmtiOutDir)/jvmti.h: $(both) $(JvmtiSrcDir)/jvmtiH.xsl
|
||||
@echo Generating $@
|
||||
@echo $(LOG_INFO) Generating $@
|
||||
$(XSLT) -IN $(JvmtiSrcDir)/jvmti.xml -XSL $(JvmtiSrcDir)/jvmtiH.xsl -OUT $(JvmtiOutDir)/jvmti.h
|
||||
|
||||
jvmtidocs: $(JvmtiOutDir)/jvmti.html
|
||||
|
||||
$(JvmtiOutDir)/jvmti.html: $(both) $(JvmtiSrcDir)/jvmti.xsl
|
||||
@echo Generating $@
|
||||
@echo $(LOG_INFO) Generating $@
|
||||
$(XSLT) -IN $(JvmtiSrcDir)/jvmti.xml -XSL $(JvmtiSrcDir)/jvmti.xsl -OUT $(JvmtiOutDir)/jvmti.html
|
||||
|
||||
# #########################################################################
|
||||
|
||||
@ -146,12 +146,12 @@ include $(GAMMADIR)/make/altsrc.make
|
||||
# The non-PIC object files are only generated for 32 bit platforms.
|
||||
ifdef LP64
|
||||
%.o: %.cpp
|
||||
@echo Compiling $<
|
||||
@echo $(LOG_INFO) Compiling $<
|
||||
$(QUIETLY) $(REMOVE_TARGET)
|
||||
$(QUIETLY) $(COMPILE.CXX) $(DEPFLAGS) -o $@ $< $(COMPILE_DONE)
|
||||
else
|
||||
%.o: %.cpp
|
||||
@echo Compiling $<
|
||||
@echo $(LOG_INFO) Compiling $<
|
||||
$(QUIETLY) $(REMOVE_TARGET)
|
||||
$(QUIETLY) $(if $(findstring $@, $(NONPIC_OBJ_FILES)), \
|
||||
$(subst $(VM_PICFLAG), ,$(COMPILE.CXX)) $(DEPFLAGS) -o $@ $< $(COMPILE_DONE), \
|
||||
@ -159,18 +159,18 @@ else
|
||||
endif
|
||||
|
||||
%.o: %.s
|
||||
@echo Assembling $<
|
||||
@echo $(LOG_INFO) Assembling $<
|
||||
$(QUIETLY) $(REMOVE_TARGET)
|
||||
$(QUIETLY) $(AS.S) $(DEPFLAGS) -o $@ $< $(COMPILE_DONE)
|
||||
|
||||
%.s: %.cpp
|
||||
@echo Generating assembly for $<
|
||||
@echo $(LOG_INFO) Generating assembly for $<
|
||||
$(QUIETLY) $(GENASM.CXX) -o $@ $<
|
||||
$(QUIETLY) $(DEMANGLE) $(COMPILE_DONE)
|
||||
|
||||
# Intermediate files (for debugging macros)
|
||||
%.i: %.cpp
|
||||
@echo Preprocessing $< to $@
|
||||
@echo $(LOG_INFO) Preprocessing $< to $@
|
||||
$(QUIETLY) $(PREPROCESS.CXX) $< > $@ $(COMPILE_DONE)
|
||||
|
||||
# Override gnumake built-in rules which do sccs get operations badly.
|
||||
|
||||
@ -67,7 +67,7 @@ all:
|
||||
fi
|
||||
|
||||
$(GENERATED)/sa-jdi.jar:: $(AGENT_FILES)
|
||||
$(QUIETLY) echo "Making $@"
|
||||
$(QUIETLY) echo $(LOG_INFO) "Making $@"
|
||||
$(QUIETLY) if [ "$(BOOT_JAVA_HOME)" = "" ]; then \
|
||||
echo "ALT_BOOTDIR, BOOTDIR or JAVA_HOME needs to be defined to build SA"; \
|
||||
exit 1; \
|
||||
|
||||
@ -80,7 +80,7 @@ $(LIBSAPROC): $(SASRCFILES) $(SAMAPFILE)
|
||||
echo "ALT_BOOTDIR, BOOTDIR or JAVA_HOME needs to be defined to build SA"; \
|
||||
exit 1; \
|
||||
fi
|
||||
@echo Making SA debugger back-end...
|
||||
@echo $(LOG_INFO) Making SA debugger back-end...
|
||||
$(QUIETLY) $(CC) -D$(BUILDARCH) -D_GNU_SOURCE \
|
||||
-D_FILE_OFFSET_BITS=64 \
|
||||
$(SYMFLAG) $(ARCHFLAG) $(SHARED_FLAG) $(PICFLAG) \
|
||||
|
||||
@ -81,7 +81,7 @@ endif
|
||||
all: $(TraceGeneratedFiles)
|
||||
|
||||
GENERATE_CODE= \
|
||||
$(QUIETLY) echo Generating $@; \
|
||||
$(QUIETLY) echo $(LOG_INFO) Generating $@; \
|
||||
$(XSLT) -IN $(word 1,$^) -XSL $(word 2,$^) -OUT $@; \
|
||||
test -f $@
|
||||
|
||||
|
||||
@ -286,7 +286,7 @@ LINK_VM = $(LINK_LIB.CC)
|
||||
|
||||
# rule for building precompiled header
|
||||
$(PRECOMPILED_HEADER):
|
||||
$(QUIETLY) echo Generating precompiled header $@
|
||||
$(QUIETLY) echo $(LOG_INFO) Generating precompiled header $@
|
||||
$(QUIETLY) mkdir -p $(PRECOMPILED_HEADER_DIR)
|
||||
$(QUIETLY) rm -f $@
|
||||
$(QUIETLY) $(COMPILE.CXX) $(DEPFLAGS) -x c++-header $(PRECOMPILED_HEADER_SRC) -o $@ $(COMPILE_DONE)
|
||||
@ -318,7 +318,7 @@ endif
|
||||
# details in bug 6538311.
|
||||
$(LIBJVM): $(LIBJVM.o) $(LIBJVM_MAPFILE) $(LD_SCRIPT)
|
||||
$(QUIETLY) { \
|
||||
echo Linking vm...; \
|
||||
echo $(LOG_INFO) Linking vm...; \
|
||||
$(LINK_LIB.CXX/PRE_HOOK) \
|
||||
$(LINK_VM) $(LD_SCRIPT_FLAG) \
|
||||
$(LFLAGS_VM) -o $@ $(sort $(LIBJVM.o)) $(LIBS_VM); \
|
||||
|
||||
@ -127,7 +127,7 @@ GENERATEDFILES = $(GENERATEDNAMES:%=$(OUTDIR)/%)
|
||||
all: $(EXEC)
|
||||
|
||||
$(EXEC) : $(OBJECTS)
|
||||
@echo Making adlc
|
||||
@echo $(LOG_INFO) Making adlc
|
||||
$(QUIETLY) $(LINK_NOPROF.CXX) -o $(EXEC) $(OBJECTS)
|
||||
|
||||
# Random dependencies:
|
||||
@ -206,7 +206,7 @@ refresh_adfiles: $(EXEC) $(SOURCE.AD) $(ADLC_UPDATER)
|
||||
$(QUIETLY) ./$(ADLC_UPDATER) adGlobals_$(Platform_arch_model).hpp $(TEMPDIR) $(OUTDIR)
|
||||
$(QUIETLY) ./$(ADLC_UPDATER) dfa_$(Platform_arch_model).cpp $(TEMPDIR) $(OUTDIR)
|
||||
$(QUIETLY) [ -f $(TEMPDIR)/made-change ] \
|
||||
|| echo "Rescanned $(SOURCE.AD) but encountered no changes."
|
||||
|| echo $(LOG_INFO) "Rescanned $(SOURCE.AD) but encountered no changes."
|
||||
$(QUIETLY) rm -rf $(TEMPDIR)
|
||||
|
||||
|
||||
@ -224,14 +224,14 @@ PROCESS_AD_FILES = awk '{ \
|
||||
print }'
|
||||
|
||||
$(OUTDIR)/%.o: %.cpp
|
||||
@echo Compiling $<
|
||||
@echo $(LOG_INFO) Compiling $<
|
||||
$(QUIETLY) $(REMOVE_TARGET)
|
||||
$(QUIETLY) $(COMPILE.CXX) -o $@ $< $(COMPILE_DONE)
|
||||
|
||||
# Some object files are given a prefix, to disambiguate
|
||||
# them from objects of the same name built for the VM.
|
||||
$(OUTDIR)/adlc-%.o: %.cpp
|
||||
@echo Compiling $<
|
||||
@echo $(LOG_INFO) Compiling $<
|
||||
$(QUIETLY) $(REMOVE_TARGET)
|
||||
$(QUIETLY) $(COMPILE.CXX) -o $@ $< $(COMPILE_DONE)
|
||||
|
||||
|
||||
@ -190,7 +190,7 @@ DATA_MODE/amd64 = 64
|
||||
DATA_MODE = $(DATA_MODE/$(BUILDARCH))
|
||||
|
||||
flags.make: $(BUILDTREE_MAKE) ../shared_dirs.lst
|
||||
@echo Creating $@ ...
|
||||
@echo $(LOG_INFO) Creating $@ ...
|
||||
$(QUIETLY) ( \
|
||||
$(BUILDTREE_COMMENT); \
|
||||
echo; \
|
||||
@ -272,7 +272,7 @@ flags.make: $(BUILDTREE_MAKE) ../shared_dirs.lst
|
||||
) > $@
|
||||
|
||||
flags_vm.make: $(BUILDTREE_MAKE) ../shared_dirs.lst
|
||||
@echo Creating $@ ...
|
||||
@echo $(LOG_INFO) Creating $@ ...
|
||||
$(QUIETLY) ( \
|
||||
$(BUILDTREE_COMMENT); \
|
||||
echo; \
|
||||
@ -280,7 +280,7 @@ flags_vm.make: $(BUILDTREE_MAKE) ../shared_dirs.lst
|
||||
) > $@
|
||||
|
||||
../shared_dirs.lst: $(BUILDTREE_MAKE) $(GAMMADIR)/src/share/vm
|
||||
@echo Creating directory list $@
|
||||
@echo $(LOG_INFO) Creating directory list $@
|
||||
$(QUIETLY) if [ -d $(HS_ALT_SRC)/share/vm ]; then \
|
||||
find $(HS_ALT_SRC)/share/vm/* -prune \
|
||||
-type d \! \( $(TOPLEVEL_EXCLUDE_DIRS) \) -exec find {} \
|
||||
@ -291,7 +291,7 @@ flags_vm.make: $(BUILDTREE_MAKE) ../shared_dirs.lst
|
||||
\( $(ALWAYS_EXCLUDE_DIRS) \) -prune -o -type d -print \; >> $@
|
||||
|
||||
Makefile: $(BUILDTREE_MAKE)
|
||||
@echo Creating $@ ...
|
||||
@echo $(LOG_INFO) Creating $@ ...
|
||||
$(QUIETLY) ( \
|
||||
$(BUILDTREE_COMMENT); \
|
||||
echo; \
|
||||
@ -301,7 +301,7 @@ Makefile: $(BUILDTREE_MAKE)
|
||||
) > $@
|
||||
|
||||
vm.make: $(BUILDTREE_MAKE)
|
||||
@echo Creating $@ ...
|
||||
@echo $(LOG_INFO) Creating $@ ...
|
||||
$(QUIETLY) ( \
|
||||
$(BUILDTREE_COMMENT); \
|
||||
echo; \
|
||||
@ -312,7 +312,7 @@ vm.make: $(BUILDTREE_MAKE)
|
||||
) > $@
|
||||
|
||||
adlc.make: $(BUILDTREE_MAKE)
|
||||
@echo Creating $@ ...
|
||||
@echo $(LOG_INFO) Creating $@ ...
|
||||
$(QUIETLY) ( \
|
||||
$(BUILDTREE_COMMENT); \
|
||||
echo; \
|
||||
@ -322,7 +322,7 @@ adlc.make: $(BUILDTREE_MAKE)
|
||||
) > $@
|
||||
|
||||
jvmti.make: $(BUILDTREE_MAKE)
|
||||
@echo Creating $@ ...
|
||||
@echo $(LOG_INFO) Creating $@ ...
|
||||
$(QUIETLY) ( \
|
||||
$(BUILDTREE_COMMENT); \
|
||||
echo; \
|
||||
@ -332,7 +332,7 @@ jvmti.make: $(BUILDTREE_MAKE)
|
||||
) > $@
|
||||
|
||||
trace.make: $(BUILDTREE_MAKE)
|
||||
@echo Creating $@ ...
|
||||
@echo $(LOG_INFO) Creating $@ ...
|
||||
$(QUIETLY) ( \
|
||||
$(BUILDTREE_COMMENT); \
|
||||
echo; \
|
||||
@ -342,7 +342,7 @@ trace.make: $(BUILDTREE_MAKE)
|
||||
) > $@
|
||||
|
||||
sa.make: $(BUILDTREE_MAKE)
|
||||
@echo Creating $@ ...
|
||||
@echo $(LOG_INFO) Creating $@ ...
|
||||
$(QUIETLY) ( \
|
||||
$(BUILDTREE_COMMENT); \
|
||||
echo; \
|
||||
@ -352,7 +352,7 @@ sa.make: $(BUILDTREE_MAKE)
|
||||
) > $@
|
||||
|
||||
dtrace.make: $(BUILDTREE_MAKE)
|
||||
@echo Creating $@ ...
|
||||
@echo $(LOG_INFO) Creating $@ ...
|
||||
$(QUIETLY) ( \
|
||||
$(BUILDTREE_COMMENT); \
|
||||
echo; \
|
||||
|
||||
@ -26,6 +26,12 @@
|
||||
# Include the top level defs.make under make directory instead of this one.
|
||||
# This file is included into make/defs.make.
|
||||
|
||||
define print_info
|
||||
ifneq ($$(LOG_LEVEL), warn)
|
||||
$$(shell echo >&2 "INFO: $1")
|
||||
endif
|
||||
endef
|
||||
|
||||
# Need PLATFORM (os-arch combo names) for jdk and hotspot, plus libarch name
|
||||
SLASH_JAVA ?= /java
|
||||
ARCH:=$(shell uname -p)
|
||||
@ -120,8 +126,7 @@ ifeq ($(JDK6_OR_EARLIER),0)
|
||||
# debug variants always get Full Debug Symbols (if available)
|
||||
ENABLE_FULL_DEBUG_SYMBOLS = 1
|
||||
endif
|
||||
_JUNK_ := $(shell \
|
||||
echo >&2 "INFO: ENABLE_FULL_DEBUG_SYMBOLS=$(ENABLE_FULL_DEBUG_SYMBOLS)")
|
||||
$(eval $(call print_info, "ENABLE_FULL_DEBUG_SYMBOLS=$(ENABLE_FULL_DEBUG_SYMBOLS)"))
|
||||
# since objcopy is optional, we set ZIP_DEBUGINFO_FILES later
|
||||
|
||||
ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
|
||||
@ -129,19 +134,16 @@ ifeq ($(JDK6_OR_EARLIER),0)
|
||||
DEF_OBJCOPY=/usr/sfw/bin/gobjcopy
|
||||
OBJCOPY=$(shell test -x $(DEF_OBJCOPY) && echo $(DEF_OBJCOPY))
|
||||
ifneq ($(ALT_OBJCOPY),)
|
||||
_JUNK_ := $(shell echo >&2 "INFO: ALT_OBJCOPY=$(ALT_OBJCOPY)")
|
||||
$(eval $(call print_info, "ALT_OBJCOPY=$(ALT_OBJCOPY)"))
|
||||
OBJCOPY=$(shell test -x $(ALT_OBJCOPY) && echo $(ALT_OBJCOPY))
|
||||
endif
|
||||
|
||||
ifeq ($(OBJCOPY),)
|
||||
_JUNK_ := $(shell \
|
||||
echo >&2 "INFO: no objcopy cmd found so cannot create .debuginfo files.")
|
||||
$(eval $(call print_info, "no objcopy cmd found so cannot create .debuginfo files."))
|
||||
ENABLE_FULL_DEBUG_SYMBOLS=0
|
||||
_JUNK_ := $(shell \
|
||||
echo >&2 "INFO: ENABLE_FULL_DEBUG_SYMBOLS=$(ENABLE_FULL_DEBUG_SYMBOLS)")
|
||||
$(eval $(call print_info, "ENABLE_FULL_DEBUG_SYMBOLS=$(ENABLE_FULL_DEBUG_SYMBOLS)"))
|
||||
else
|
||||
_JUNK_ := $(shell \
|
||||
echo >&2 "INFO: $(OBJCOPY) cmd found so will create .debuginfo files.")
|
||||
$(eval $(call print_info, "$(OBJCOPY) cmd found so will create .debuginfo files."))
|
||||
|
||||
# Library stripping policies for .debuginfo configs:
|
||||
# all_strip - strips everything from the library
|
||||
@ -155,13 +157,11 @@ ifeq ($(JDK6_OR_EARLIER),0)
|
||||
#
|
||||
STRIP_POLICY ?= min_strip
|
||||
|
||||
_JUNK_ := $(shell \
|
||||
echo >&2 "INFO: STRIP_POLICY=$(STRIP_POLICY)")
|
||||
$(eval $(call print_info, "STRIP_POLICY=$(STRIP_POLICY)"))
|
||||
|
||||
ZIP_DEBUGINFO_FILES ?= 1
|
||||
|
||||
_JUNK_ := $(shell \
|
||||
echo >&2 "INFO: ZIP_DEBUGINFO_FILES=$(ZIP_DEBUGINFO_FILES)")
|
||||
$(eval $(call print_info, "ZIP_DEBUGINFO_FILES=$(ZIP_DEBUGINFO_FILES)"))
|
||||
endif
|
||||
endif # ENABLE_FULL_DEBUG_SYMBOLS=1
|
||||
endif # BUILD_FLAVOR
|
||||
|
||||
@ -32,7 +32,7 @@ ifneq ("${TYPE}", "CORE")
|
||||
ifdef USE_GCC
|
||||
|
||||
dtraceCheck:
|
||||
$(QUIETLY) echo "**NOTICE** Dtrace support disabled for gcc builds"
|
||||
$(QUIETLY) echo $(LOG_INFO) "**NOTICE** Dtrace support disabled for gcc builds"
|
||||
|
||||
else
|
||||
|
||||
@ -102,7 +102,7 @@ XLIBJVM_DTRACE_DEBUGINFO = $(XLIBJVM_DIR)/$(LIBJVM_DTRACE_DEBUGINFO)
|
||||
XLIBJVM_DTRACE_DIZ = $(XLIBJVM_DIR)/$(LIBJVM_DTRACE_DIZ)
|
||||
|
||||
$(XLIBJVM_DB): $(ADD_GNU_DEBUGLINK) $(FIX_EMPTY_SEC_HDR_FLAGS) $(DTRACE_SRCDIR)/$(JVM_DB).c $(JVMOFFS).h $(LIBJVM_DB_MAPFILE)
|
||||
@echo Making $@
|
||||
@echo $(LOG_INFO) Making $@
|
||||
$(QUIETLY) mkdir -p $(XLIBJVM_DIR) ; \
|
||||
$(CC) $(SYMFLAG) $(ARCHFLAG/$(ISA)) -D$(TYPE) -I. -I$(GENERATED) \
|
||||
$(SHARED_FLAG) $(LFLAGS_JVM_DB) -o $@ $(DTRACE_SRCDIR)/$(JVM_DB).c -lc
|
||||
@ -137,7 +137,7 @@ ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
|
||||
endif
|
||||
|
||||
$(XLIBJVM_DTRACE): $(ADD_GNU_DEBUGLINK) $(FIX_EMPTY_SEC_HDR_FLAGS) $(DTRACE_SRCDIR)/$(JVM_DTRACE).c $(DTRACE_SRCDIR)/$(JVM_DTRACE).h $(LIBJVM_DTRACE_MAPFILE)
|
||||
@echo Making $@
|
||||
@echo $(LOG_INFO) Making $@
|
||||
$(QUIETLY) mkdir -p $(XLIBJVM_DIR) ; \
|
||||
$(CC) $(SYMFLAG) $(ARCHFLAG/$(ISA)) -D$(TYPE) -I. \
|
||||
$(SHARED_FLAG) $(LFLAGS_JVM_DTRACE) -o $@ $(DTRACE_SRCDIR)/$(JVM_DTRACE).c -lc -lthread -ldoor
|
||||
@ -207,7 +207,7 @@ $(JVMOFFS.o): $(JVMOFFS).h $(JVMOFFS).cpp
|
||||
$(QUIETLY) $(CXX) -c -I. -o $@ $(ARCHFLAG) -D$(TYPE) $(JVMOFFS).cpp
|
||||
|
||||
$(LIBJVM_DB): $(ADD_GNU_DEBUGLINK) $(FIX_EMPTY_SEC_HDR_FLAGS) $(DTRACE_SRCDIR)/$(JVM_DB).c $(JVMOFFS.o) $(XLIBJVM_DB) $(LIBJVM_DB_MAPFILE)
|
||||
@echo Making $@
|
||||
@echo $(LOG_INFO) Making $@
|
||||
$(QUIETLY) $(CC) $(SYMFLAG) $(ARCHFLAG) -D$(TYPE) -I. -I$(GENERATED) \
|
||||
$(SHARED_FLAG) $(LFLAGS_JVM_DB) -o $@ $(DTRACE_SRCDIR)/$(JVM_DB).c -lc
|
||||
ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
|
||||
@ -232,7 +232,7 @@ ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
|
||||
endif
|
||||
|
||||
$(LIBJVM_DTRACE): $(ADD_GNU_DEBUGLINK) $(FIX_EMPTY_SEC_HDR_FLAGS) $(DTRACE_SRCDIR)/$(JVM_DTRACE).c $(XLIBJVM_DTRACE) $(DTRACE_SRCDIR)/$(JVM_DTRACE).h $(LIBJVM_DTRACE_MAPFILE)
|
||||
@echo Making $@
|
||||
@echo $(LOG_INFO) Making $@
|
||||
$(QUIETLY) $(CC) $(SYMFLAG) $(ARCHFLAG) -D$(TYPE) -I. \
|
||||
$(SHARED_FLAG) $(LFLAGS_JVM_DTRACE) -o $@ $(DTRACE_SRCDIR)/$(JVM_DTRACE).c -lc -lthread -ldoor
|
||||
ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
|
||||
@ -286,7 +286,7 @@ DTraced_Files = ciEnv.o \
|
||||
|
||||
# Dtrace is available, so we build $(DTRACE.o)
|
||||
$(DTRACE.o): $(DTRACE).d $(DTraced_Files)
|
||||
@echo Compiling $(DTRACE).d
|
||||
@echo $(LOG_INFO) Compiling $(DTRACE).d
|
||||
|
||||
$(QUIETLY) $(DTRACE_PROG) $(DTRACE_OPTS) -C -I. -G -xlazyload -o $@ -s $(DTRACE).d \
|
||||
$(DTraced_Files) ||\
|
||||
@ -352,7 +352,7 @@ dtrace_gen_headers: $(DtraceOutDir)/hotspot.h $(DtraceOutDir)/hotspot_jni.h $(Dt
|
||||
# The jhelper.d and hotspot probes are separated into two different SUNW_dof sections.
|
||||
# Now the jhelper.d is built without the -Xlazyload flag.
|
||||
$(DTRACE_JHELPER.o) : $(DTRACE_JHELPER).d $(JVMOFFS).h $(JVMOFFS)Index.h
|
||||
@echo Compiling $(DTRACE_JHELPER).d
|
||||
@echo $(LOG_INFO) Compiling $(DTRACE_JHELPER).d
|
||||
$(QUIETLY) $(DTRACE_PROG) $(DTRACE_OPTS) -C -I. -G -o $@ -s $(DTRACE_JHELPER).d
|
||||
|
||||
.PHONY: dtraceCheck
|
||||
@ -391,14 +391,14 @@ dtraceCheck:
|
||||
else # manually disabled
|
||||
|
||||
dtraceCheck:
|
||||
$(QUIETLY) echo "**NOTICE** Dtrace support disabled via environment variable"
|
||||
$(QUIETLY) echo $(LOG_INFO) "**NOTICE** Dtrace support disabled via environment variable"
|
||||
|
||||
endif # ifeq ("${HOTSPOT_DISABLE_DTRACE_PROBES}", "")
|
||||
|
||||
else # No dtrace program found
|
||||
|
||||
dtraceCheck:
|
||||
$(QUIETLY) echo "**NOTICE** Dtrace support disabled: not supported by system"
|
||||
$(QUIETLY) echo $(LOG_INFO) "**NOTICE** Dtrace support disabled: not supported by system"
|
||||
|
||||
endif # ifneq ("${dtraceFound}", "")
|
||||
|
||||
@ -407,6 +407,6 @@ endif # ifdef USE_GCC
|
||||
else # CORE build
|
||||
|
||||
dtraceCheck:
|
||||
$(QUIETLY) echo "**NOTICE** Dtrace support disabled for CORE builds"
|
||||
$(QUIETLY) echo $(LOG_INFO) "**NOTICE** Dtrace support disabled for CORE builds"
|
||||
|
||||
endif # ifneq ("${TYPE}", "CORE")
|
||||
|
||||
@ -48,7 +48,7 @@ LFLAGS_JSIG += -mt -xnolib
|
||||
endif
|
||||
|
||||
$(LIBJSIG): $(ADD_GNU_DEBUGLINK) $(FIX_EMPTY_SEC_HDR_FLAGS) $(JSIGSRCDIR)/jsig.c $(LIBJSIG_MAPFILE)
|
||||
@echo Making signal interposition lib...
|
||||
@echo $(LOG_INFO) Making signal interposition lib...
|
||||
$(QUIETLY) $(CC) $(SYMFLAG) $(ARCHFLAG) $(SHARED_FLAG) $(PICFLAG) \
|
||||
$(LFLAGS_JSIG) -o $@ $(JSIGSRCDIR)/jsig.c -ldl
|
||||
ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
|
||||
|
||||
@ -74,34 +74,34 @@ $(JvmtiEnvFillClass): $(JvmtiEnvFillSource)
|
||||
$(QUIETLY) $(COMPILE.JAVAC) -d $(JvmtiOutDir) $(JvmtiEnvFillSource)
|
||||
|
||||
$(JvmtiOutDir)/jvmtiEnter.cpp: $(both) $(JvmtiSrcDir)/jvmtiEnter.xsl
|
||||
@echo Generating $@
|
||||
@echo $(LOG_INFO) Generating $@
|
||||
$(XSLT) -IN $(JvmtiSrcDir)/jvmti.xml -XSL $(JvmtiSrcDir)/jvmtiEnter.xsl -OUT $(JvmtiOutDir)/jvmtiEnter.cpp -PARAM interface jvmti
|
||||
|
||||
$(JvmtiOutDir)/bytecodeInterpreterWithChecks.cpp: $(JvmtiGenClass) $(InterpreterSrcDir)/bytecodeInterpreter.cpp $(InterpreterSrcDir)/bytecodeInterpreterWithChecks.xml $(InterpreterSrcDir)/bytecodeInterpreterWithChecks.xsl
|
||||
@echo Generating $@
|
||||
@echo $(LOG_INFO) Generating $@
|
||||
$(XSLT) -IN $(InterpreterSrcDir)/bytecodeInterpreterWithChecks.xml -XSL $(InterpreterSrcDir)/bytecodeInterpreterWithChecks.xsl -OUT $(JvmtiOutDir)/bytecodeInterpreterWithChecks.cpp
|
||||
|
||||
$(JvmtiOutDir)/jvmtiEnterTrace.cpp: $(both) $(JvmtiSrcDir)/jvmtiEnter.xsl
|
||||
@echo Generating $@
|
||||
@echo $(LOG_INFO) Generating $@
|
||||
$(XSLT) -IN $(JvmtiSrcDir)/jvmti.xml -XSL $(JvmtiSrcDir)/jvmtiEnter.xsl -OUT $(JvmtiOutDir)/jvmtiEnterTrace.cpp -PARAM interface jvmti -PARAM trace Trace
|
||||
|
||||
$(JvmtiOutDir)/jvmtiEnvRecommended.cpp: $(both) $(JvmtiSrcDir)/jvmtiEnv.xsl $(JvmtiSrcDir)/jvmtiEnv.cpp $(JvmtiEnvFillClass)
|
||||
@echo Generating $@
|
||||
@echo $(LOG_INFO) Generating $@
|
||||
$(XSLT) -IN $(JvmtiSrcDir)/jvmti.xml -XSL $(JvmtiSrcDir)/jvmtiEnv.xsl -OUT $(JvmtiOutDir)/jvmtiEnvStub.cpp
|
||||
$(QUIETLY) $(RUN.JAVA) -classpath $(JvmtiOutDir) jvmtiEnvFill $(JvmtiSrcDir)/jvmtiEnv.cpp $(JvmtiOutDir)/jvmtiEnvStub.cpp $(JvmtiOutDir)/jvmtiEnvRecommended.cpp
|
||||
|
||||
$(JvmtiOutDir)/jvmtiEnv.hpp: $(both) $(JvmtiSrcDir)/jvmtiHpp.xsl
|
||||
@echo Generating $@
|
||||
@echo $(LOG_INFO) Generating $@
|
||||
$(XSLT) -IN $(JvmtiSrcDir)/jvmti.xml -XSL $(JvmtiSrcDir)/jvmtiHpp.xsl -OUT $(JvmtiOutDir)/jvmtiEnv.hpp
|
||||
|
||||
$(JvmtiOutDir)/jvmti.h: $(both) $(JvmtiSrcDir)/jvmtiH.xsl
|
||||
@echo Generating $@
|
||||
@echo $(LOG_INFO) Generating $@
|
||||
$(XSLT) -IN $(JvmtiSrcDir)/jvmti.xml -XSL $(JvmtiSrcDir)/jvmtiH.xsl -OUT $(JvmtiOutDir)/jvmti.h
|
||||
|
||||
jvmtidocs: $(JvmtiOutDir)/jvmti.html
|
||||
|
||||
$(JvmtiOutDir)/jvmti.html: $(both) $(JvmtiSrcDir)/jvmti.xsl
|
||||
@echo Generating $@
|
||||
@echo $(LOG_INFO) Generating $@
|
||||
$(XSLT) -IN $(JvmtiSrcDir)/jvmti.xml -XSL $(JvmtiSrcDir)/jvmti.xsl -OUT $(JvmtiOutDir)/jvmti.html
|
||||
|
||||
# #########################################################################
|
||||
@ -113,4 +113,3 @@ cleanall :
|
||||
rm $(JvmtiGenClass) $(JvmtiEnvFillClass) $(JvmtiGeneratedFiles)
|
||||
|
||||
# #########################################################################
|
||||
|
||||
|
||||
@ -138,12 +138,12 @@ include $(GAMMADIR)/make/altsrc.make
|
||||
# Sun compiler for 64 bit Solaris does not support building non-PIC object files.
|
||||
ifdef LP64
|
||||
%.o: %.cpp
|
||||
@echo Compiling $<
|
||||
@echo $(LOG_INFO) Compiling $<
|
||||
$(QUIETLY) $(REMOVE_TARGET)
|
||||
$(QUIETLY) $(COMPILE.CXX) $(DEPFLAGS) -o $@ $< $(COMPILE_DONE)
|
||||
else
|
||||
%.o: %.cpp
|
||||
@echo Compiling $<
|
||||
@echo $(LOG_INFO) Compiling $<
|
||||
$(QUIETLY) $(REMOVE_TARGET)
|
||||
$(QUIETLY) $(if $(findstring $@, $(NONPIC_OBJ_FILES)), \
|
||||
$(subst $(VM_PICFLAG), ,$(COMPILE.CXX)) $(DEPFLAGS) -o $@ $< $(COMPILE_DONE), \
|
||||
@ -151,18 +151,18 @@ else
|
||||
endif
|
||||
|
||||
%.o: %.s
|
||||
@echo Assembling $<
|
||||
@echo $(LOG_INFO) Assembling $<
|
||||
$(QUIETLY) $(REMOVE_TARGET)
|
||||
$(QUIETLY) $(AS.S) -o $@ $< $(COMPILE_DONE)
|
||||
|
||||
%.s: %.cpp
|
||||
@echo Generating assembly for $<
|
||||
@echo $(LOG_INFO) Generating assembly for $<
|
||||
$(QUIETLY) $(GENASM.CXX) -o $@ $<
|
||||
$(QUIETLY) $(DEMANGLE) $(COMPILE_DONE)
|
||||
|
||||
# Intermediate files (for debugging macros)
|
||||
%.i: %.cpp
|
||||
@echo Preprocessing $< to $@
|
||||
@echo $(LOG_INFO) Preprocessing $< to $@
|
||||
$(QUIETLY) $(PREPROCESS.CXX) $< > $@ $(COMPILE_DONE)
|
||||
|
||||
# Override gnumake built-in rules which do sccs get operations badly.
|
||||
|
||||
@ -58,7 +58,7 @@ all:
|
||||
fi
|
||||
|
||||
$(GENERATED)/sa-jdi.jar: $(AGENT_FILES)
|
||||
$(QUIETLY) echo "Making $@";
|
||||
$(QUIETLY) echo $(LOG_INFO) "Making $@";
|
||||
$(QUIETLY) if [ "$(BOOT_JAVA_HOME)" = "" ]; then \
|
||||
echo "ALT_BOOTDIR, BOOTDIR or JAVA_HOME needs to be defined to build SA"; \
|
||||
exit 1; \
|
||||
|
||||
@ -95,7 +95,7 @@ $(LIBSAPROC): $(ADD_GNU_DEBUGLINK) $(FIX_EMPTY_SEC_HDR_FLAGS) $(SASRCFILES) $(SA
|
||||
echo "ALT_BOOTDIR, BOOTDIR or JAVA_HOME needs to be defined to build SA"; \
|
||||
exit 1; \
|
||||
fi
|
||||
@echo Making SA debugger back-end...
|
||||
@echo $(LOG_INFO) Making SA debugger back-end...
|
||||
$(QUIETLY) $(CXX) \
|
||||
$(SYMFLAG) $(ARCHFLAG) $(SHARED_FLAG) $(PICFLAG) \
|
||||
-I$(SASRCDIR) \
|
||||
|
||||
@ -77,7 +77,7 @@ endif
|
||||
all: $(TraceGeneratedFiles)
|
||||
|
||||
GENERATE_CODE= \
|
||||
$(QUIETLY) echo Generating $@; \
|
||||
$(QUIETLY) echo $(LOG_INFO) Generating $@; \
|
||||
$(XSLT) -IN $(word 1,$^) -XSL $(word 2,$^) -OUT $@; \
|
||||
test -f $@
|
||||
|
||||
@ -112,5 +112,3 @@ endif
|
||||
|
||||
clean cleanall:
|
||||
rm $(TraceGeneratedFiles)
|
||||
|
||||
|
||||
|
||||
@ -295,7 +295,7 @@ endif
|
||||
# making the library:
|
||||
$(LIBJVM): $(ADD_GNU_DEBUGLINK) $(FIX_EMPTY_SEC_HDR_FLAGS) $(LIBJVM.o) $(LIBJVM_MAPFILE)
|
||||
ifeq ($(filter -sbfast -xsbfast, $(CFLAGS_BROWSE)),)
|
||||
@echo Linking vm...
|
||||
@echo $(LOG_INFO) Linking vm...
|
||||
$(QUIETLY) $(LINK_LIB.CXX/PRE_HOOK)
|
||||
$(QUIETLY) $(LINK_VM) $(LFLAGS_VM) -o $@ $(sort $(LIBJVM.o)) $(LIBS_VM)
|
||||
$(QUIETLY) $(LINK_LIB.CXX/POST_HOOK)
|
||||
|
||||
@ -31,12 +31,8 @@
|
||||
ProjectCreatorSources=\
|
||||
$(WorkSpace)\src\share\tools\ProjectCreator\ProjectCreator.java \
|
||||
$(WorkSpace)\src\share\tools\ProjectCreator\FileTreeCreator.java \
|
||||
$(WorkSpace)\src\share\tools\ProjectCreator\FileTreeCreatorVC7.java \
|
||||
$(WorkSpace)\src\share\tools\ProjectCreator\FileTreeCreatorVC10.java \
|
||||
$(WorkSpace)\src\share\tools\ProjectCreator\WinGammaPlatform.java \
|
||||
$(WorkSpace)\src\share\tools\ProjectCreator\WinGammaPlatformVC7.java \
|
||||
$(WorkSpace)\src\share\tools\ProjectCreator\WinGammaPlatformVC8.java \
|
||||
$(WorkSpace)\src\share\tools\ProjectCreator\WinGammaPlatformVC9.java \
|
||||
$(WorkSpace)\src\share\tools\ProjectCreator\WinGammaPlatformVC10.java \
|
||||
$(WorkSpace)\src\share\tools\ProjectCreator\Util.java \
|
||||
$(WorkSpace)\src\share\tools\ProjectCreator\BuildConfig.java \
|
||||
|
||||
@ -1166,9 +1166,9 @@ void InterpreterMacroAssembler::test_backedge_count_for_osr(Register backedge_co
|
||||
beq(CCR0, overflow_with_error);
|
||||
|
||||
// Has the nmethod been invalidated already?
|
||||
lwz(Rtmp, nmethod::entry_bci_offset(), R3_RET);
|
||||
cmpwi(CCR0, Rtmp, InvalidOSREntryBci);
|
||||
beq(CCR0, overflow_with_error);
|
||||
lbz(Rtmp, nmethod::state_offset(), R3_RET);
|
||||
cmpwi(CCR0, Rtmp, nmethod::in_use);
|
||||
bne(CCR0, overflow_with_error);
|
||||
|
||||
// Migrate the interpreter frame off of the stack.
|
||||
// We can use all registers because we will not return to interpreter from this point.
|
||||
|
||||
@ -1674,9 +1674,9 @@ void TemplateTable::branch(bool is_jsr, bool is_wide) {
|
||||
__ beq(CCR0, Lforward);
|
||||
|
||||
// Has the nmethod been invalidated already?
|
||||
__ lwz(R0, nmethod::entry_bci_offset(), R3_RET);
|
||||
__ cmpwi(CCR0, R0, InvalidOSREntryBci);
|
||||
__ beq(CCR0, Lforward);
|
||||
__ lbz(R0, nmethod::state_offset(), R3_RET);
|
||||
__ cmpwi(CCR0, R0, nmethod::in_use);
|
||||
__ bne(CCR0, Lforward);
|
||||
|
||||
// Migrate the interpreter frame off of the stack.
|
||||
// We can use all registers because we will not return to interpreter from this point.
|
||||
|
||||
@ -2407,8 +2407,8 @@ void InterpreterMacroAssembler::test_backedge_count_for_osr( Register backedge_c
|
||||
br_null_short(O0, Assembler::pn, overflow_with_error);
|
||||
|
||||
// Has the nmethod been invalidated already?
|
||||
ld(O0, nmethod::entry_bci_offset(), O2);
|
||||
cmp_and_br_short(O2, InvalidOSREntryBci, Assembler::equal, Assembler::pn, overflow_with_error);
|
||||
ldub(O0, nmethod::state_offset(), O2);
|
||||
cmp_and_br_short(O2, nmethod::in_use, Assembler::notEqual, Assembler::pn, overflow_with_error);
|
||||
|
||||
// migrate the interpreter frame off of the stack
|
||||
|
||||
|
||||
@ -1636,8 +1636,8 @@ void TemplateTable::branch(bool is_jsr, bool is_wide) {
|
||||
__ br_null_short(O0, Assembler::pn, Lforward);
|
||||
|
||||
// Has the nmethod been invalidated already?
|
||||
__ ld(O0, nmethod::entry_bci_offset(), O2);
|
||||
__ cmp_and_br_short(O2, InvalidOSREntryBci, Assembler::equal, Assembler::pn, Lforward);
|
||||
__ ldub(O0, nmethod::state_offset(), O2);
|
||||
__ cmp_and_br_short(O2, nmethod::in_use, Assembler::notEqual, Assembler::pn, Lforward);
|
||||
|
||||
// migrate the interpreter frame off of the stack
|
||||
|
||||
|
||||
@ -1724,9 +1724,8 @@ void TemplateTable::branch(bool is_jsr, bool is_wide) {
|
||||
__ testptr(rax, rax); // test result
|
||||
__ jcc(Assembler::zero, dispatch); // no osr if null
|
||||
// nmethod may have been invalidated (VM may block upon call_VM return)
|
||||
__ movl(rcx, Address(rax, nmethod::entry_bci_offset()));
|
||||
__ cmpl(rcx, InvalidOSREntryBci);
|
||||
__ jcc(Assembler::equal, dispatch);
|
||||
__ cmpb(Address(rax, nmethod::state_offset()), nmethod::in_use);
|
||||
__ jcc(Assembler::notEqual, dispatch);
|
||||
|
||||
// We have the address of an on stack replacement routine in rax,
|
||||
// We need to prepare to execute the OSR method. First we must
|
||||
@ -1734,8 +1733,7 @@ void TemplateTable::branch(bool is_jsr, bool is_wide) {
|
||||
|
||||
__ mov(rbx, rax); // save the nmethod
|
||||
|
||||
const Register thread = rcx;
|
||||
__ get_thread(thread);
|
||||
__ get_thread(rcx);
|
||||
call_VM(noreg, CAST_FROM_FN_PTR(address, SharedRuntime::OSR_migration_begin));
|
||||
// rax, is OSR buffer, move it to expected parameter location
|
||||
__ mov(rcx, rax);
|
||||
|
||||
@ -1751,9 +1751,8 @@ void TemplateTable::branch(bool is_jsr, bool is_wide) {
|
||||
__ testptr(rax, rax); // test result
|
||||
__ jcc(Assembler::zero, dispatch); // no osr if null
|
||||
// nmethod may have been invalidated (VM may block upon call_VM return)
|
||||
__ movl(rcx, Address(rax, nmethod::entry_bci_offset()));
|
||||
__ cmpl(rcx, InvalidOSREntryBci);
|
||||
__ jcc(Assembler::equal, dispatch);
|
||||
__ cmpb(Address(rax, nmethod::state_offset()), nmethod::in_use);
|
||||
__ jcc(Assembler::notEqual, dispatch);
|
||||
|
||||
// We have the address of an on stack replacement routine in eax
|
||||
// We need to prepare to execute the OSR method. First we must
|
||||
|
||||
@ -4002,10 +4002,6 @@ bool os::check_heap(bool force) {
|
||||
return true;
|
||||
}
|
||||
|
||||
// int local_vsnprintf(char* buf, size_t count, const char* format, va_list args) {
|
||||
// return ::vsnprintf(buf, count, format, args);
|
||||
// }
|
||||
|
||||
// Is a (classpath) directory empty?
|
||||
bool os::dir_is_empty(const char* path) {
|
||||
DIR *dir = NULL;
|
||||
|
||||
@ -269,4 +269,8 @@ inline bool os::supports_monotonic_clock() {
|
||||
return true;
|
||||
}
|
||||
|
||||
inline void os::exit(int num) {
|
||||
::exit(num);
|
||||
}
|
||||
|
||||
#endif // OS_AIX_VM_OS_AIX_INLINE_HPP
|
||||
|
||||
@ -255,6 +255,7 @@ int generateJvmOffsets(GEN_variant gen_variant) {
|
||||
printf("\n");
|
||||
|
||||
GEN_OFFS(nmethod, _method);
|
||||
GEN_OFFS(nmethod, _dependencies_offset);
|
||||
GEN_OFFS(nmethod, _oops_offset);
|
||||
GEN_OFFS(nmethod, _scopes_data_offset);
|
||||
GEN_OFFS(nmethod, _scopes_pcs_offset);
|
||||
|
||||
@ -595,7 +595,7 @@ static int nmethod_info(Nmethod_t *N)
|
||||
/* scopes_pcs */
|
||||
err = ps_pread(J->P, nm + OFFSET_nmethod_scopes_pcs_offset, &N->scopes_pcs_beg, SZ32);
|
||||
CHECK_FAIL(err);
|
||||
err = ps_pread(J->P, nm + OFFSET_nmethod_handler_table_offset, &N->scopes_pcs_end, SZ32);
|
||||
err = ps_pread(J->P, nm + OFFSET_nmethod_dependencies_offset, &N->scopes_pcs_end, SZ32);
|
||||
CHECK_FAIL(err);
|
||||
|
||||
/* scopes_data */
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -30,8 +30,8 @@
|
||||
// Information about the protection of the page at address '0' on this os.
|
||||
static bool zero_page_read_protected() { return true; }
|
||||
|
||||
/* pthread_getattr_np comes with BsdThreads-0.9-7 on RedHat 7.1 */
|
||||
typedef int (*pthread_getattr_func_type) (pthread_t, pthread_attr_t *);
|
||||
// pthread_getattr_np comes with BsdThreads-0.9-7 on RedHat 7.1
|
||||
typedef int (*pthread_getattr_func_type)(pthread_t, pthread_attr_t *);
|
||||
|
||||
#ifdef __APPLE__
|
||||
// Mac OS X doesn't support clock_gettime. Stub out the type, it is
|
||||
@ -108,7 +108,7 @@ class Bsd {
|
||||
// that file provides extensions to the os class and not the
|
||||
// Bsd class.
|
||||
static ExtendedPC fetch_frame_from_ucontext(Thread* thread, ucontext_t* uc,
|
||||
intptr_t** ret_sp, intptr_t** ret_fp);
|
||||
intptr_t** ret_sp, intptr_t** ret_fp);
|
||||
|
||||
// This boolean allows users to forward their own non-matching signals
|
||||
// to JVM_handle_bsd_signal, harmlessly.
|
||||
@ -147,7 +147,7 @@ class Bsd {
|
||||
// BsdThreads work-around for 6292965
|
||||
static int safe_cond_timedwait(pthread_cond_t *_cond, pthread_mutex_t *_mutex, const struct timespec *_abstime);
|
||||
|
||||
private:
|
||||
private:
|
||||
typedef int (*sched_getcpu_func_t)(void);
|
||||
typedef int (*numa_node_to_cpus_func_t)(int node, unsigned long *buffer, int bufferlen);
|
||||
typedef int (*numa_max_node_func_t)(void);
|
||||
@ -170,7 +170,7 @@ private:
|
||||
static void set_numa_tonode_memory(numa_tonode_memory_func_t func) { _numa_tonode_memory = func; }
|
||||
static void set_numa_interleave_memory(numa_interleave_memory_func_t func) { _numa_interleave_memory = func; }
|
||||
static void set_numa_all_nodes(unsigned long* ptr) { _numa_all_nodes = ptr; }
|
||||
public:
|
||||
public:
|
||||
static int sched_getcpu() { return _sched_getcpu != NULL ? _sched_getcpu() : -1; }
|
||||
static int numa_node_to_cpus(int node, unsigned long *buffer, int bufferlen) {
|
||||
return _numa_node_to_cpus != NULL ? _numa_node_to_cpus(node, buffer, bufferlen) : -1;
|
||||
@ -190,55 +190,55 @@ public:
|
||||
|
||||
|
||||
class PlatformEvent : public CHeapObj<mtInternal> {
|
||||
private:
|
||||
double CachePad[4]; // increase odds that _mutex is sole occupant of cache line
|
||||
volatile int _Event;
|
||||
volatile int _nParked;
|
||||
pthread_mutex_t _mutex[1];
|
||||
pthread_cond_t _cond[1];
|
||||
double PostPad[2];
|
||||
Thread * _Assoc;
|
||||
private:
|
||||
double CachePad[4]; // increase odds that _mutex is sole occupant of cache line
|
||||
volatile int _Event;
|
||||
volatile int _nParked;
|
||||
pthread_mutex_t _mutex[1];
|
||||
pthread_cond_t _cond[1];
|
||||
double PostPad[2];
|
||||
Thread * _Assoc;
|
||||
|
||||
public: // TODO-FIXME: make dtor private
|
||||
~PlatformEvent() { guarantee(0, "invariant"); }
|
||||
public: // TODO-FIXME: make dtor private
|
||||
~PlatformEvent() { guarantee(0, "invariant"); }
|
||||
|
||||
public:
|
||||
PlatformEvent() {
|
||||
int status;
|
||||
status = pthread_cond_init (_cond, NULL);
|
||||
assert_status(status == 0, status, "cond_init");
|
||||
status = pthread_mutex_init (_mutex, NULL);
|
||||
assert_status(status == 0, status, "mutex_init");
|
||||
_Event = 0;
|
||||
_nParked = 0;
|
||||
_Assoc = NULL;
|
||||
}
|
||||
public:
|
||||
PlatformEvent() {
|
||||
int status;
|
||||
status = pthread_cond_init(_cond, NULL);
|
||||
assert_status(status == 0, status, "cond_init");
|
||||
status = pthread_mutex_init(_mutex, NULL);
|
||||
assert_status(status == 0, status, "mutex_init");
|
||||
_Event = 0;
|
||||
_nParked = 0;
|
||||
_Assoc = NULL;
|
||||
}
|
||||
|
||||
// Use caution with reset() and fired() -- they may require MEMBARs
|
||||
void reset() { _Event = 0; }
|
||||
int fired() { return _Event; }
|
||||
void park();
|
||||
void unpark();
|
||||
int park(jlong millis);
|
||||
void SetAssociation(Thread * a) { _Assoc = a; }
|
||||
// Use caution with reset() and fired() -- they may require MEMBARs
|
||||
void reset() { _Event = 0; }
|
||||
int fired() { return _Event; }
|
||||
void park();
|
||||
void unpark();
|
||||
int park(jlong millis);
|
||||
void SetAssociation(Thread * a) { _Assoc = a; }
|
||||
};
|
||||
|
||||
class PlatformParker : public CHeapObj<mtInternal> {
|
||||
protected:
|
||||
pthread_mutex_t _mutex[1];
|
||||
pthread_cond_t _cond[1];
|
||||
protected:
|
||||
pthread_mutex_t _mutex[1];
|
||||
pthread_cond_t _cond[1];
|
||||
|
||||
public: // TODO-FIXME: make dtor private
|
||||
~PlatformParker() { guarantee(0, "invariant"); }
|
||||
public: // TODO-FIXME: make dtor private
|
||||
~PlatformParker() { guarantee(0, "invariant"); }
|
||||
|
||||
public:
|
||||
PlatformParker() {
|
||||
int status;
|
||||
status = pthread_cond_init (_cond, NULL);
|
||||
assert_status(status == 0, status, "cond_init");
|
||||
status = pthread_mutex_init (_mutex, NULL);
|
||||
assert_status(status == 0, status, "mutex_init");
|
||||
}
|
||||
public:
|
||||
PlatformParker() {
|
||||
int status;
|
||||
status = pthread_cond_init(_cond, NULL);
|
||||
assert_status(status == 0, status, "cond_init");
|
||||
status = pthread_mutex_init(_mutex, NULL);
|
||||
assert_status(status == 0, status, "mutex_init");
|
||||
}
|
||||
};
|
||||
|
||||
#endif // OS_BSD_VM_OS_BSD_HPP
|
||||
|
||||
@ -274,4 +274,8 @@ inline bool os::supports_monotonic_clock() {
|
||||
#endif
|
||||
}
|
||||
|
||||
inline void os::exit(int num) {
|
||||
::exit(num);
|
||||
}
|
||||
|
||||
#endif // OS_BSD_VM_OS_BSD_INLINE_HPP
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -27,8 +27,8 @@
|
||||
|
||||
// Linux_OS defines the interface to Linux operating systems
|
||||
|
||||
/* pthread_getattr_np comes with LinuxThreads-0.9-7 on RedHat 7.1 */
|
||||
typedef int (*pthread_getattr_func_type) (pthread_t, pthread_attr_t *);
|
||||
// pthread_getattr_np comes with LinuxThreads-0.9-7 on RedHat 7.1
|
||||
typedef int (*pthread_getattr_func_type)(pthread_t, pthread_attr_t *);
|
||||
|
||||
// Information about the protection of the page at address '0' on this os.
|
||||
static bool zero_page_read_protected() { return true; }
|
||||
@ -151,7 +151,7 @@ class Linux {
|
||||
// that file provides extensions to the os class and not the
|
||||
// Linux class.
|
||||
static ExtendedPC fetch_frame_from_ucontext(Thread* thread, ucontext_t* uc,
|
||||
intptr_t** ret_sp, intptr_t** ret_fp);
|
||||
intptr_t** ret_sp, intptr_t** ret_fp);
|
||||
|
||||
// This boolean allows users to forward their own non-matching signals
|
||||
// to JVM_handle_linux_signal, harmlessly.
|
||||
@ -222,10 +222,10 @@ class Linux {
|
||||
static jlong fast_thread_cpu_time(clockid_t clockid);
|
||||
|
||||
// pthread_cond clock suppport
|
||||
private:
|
||||
private:
|
||||
static pthread_condattr_t _condattr[1];
|
||||
|
||||
public:
|
||||
public:
|
||||
static pthread_condattr_t* condAttr() { return _condattr; }
|
||||
|
||||
// Stack repair handling
|
||||
@ -235,7 +235,7 @@ class Linux {
|
||||
// LinuxThreads work-around for 6292965
|
||||
static int safe_cond_timedwait(pthread_cond_t *_cond, pthread_mutex_t *_mutex, const struct timespec *_abstime);
|
||||
|
||||
private:
|
||||
private:
|
||||
typedef int (*sched_getcpu_func_t)(void);
|
||||
typedef int (*numa_node_to_cpus_func_t)(int node, unsigned long *buffer, int bufferlen);
|
||||
typedef int (*numa_max_node_func_t)(void);
|
||||
@ -262,7 +262,7 @@ private:
|
||||
static void set_numa_set_bind_policy(numa_set_bind_policy_func_t func) { _numa_set_bind_policy = func; }
|
||||
static void set_numa_all_nodes(unsigned long* ptr) { _numa_all_nodes = ptr; }
|
||||
static int sched_getcpu_syscall(void);
|
||||
public:
|
||||
public:
|
||||
static int sched_getcpu() { return _sched_getcpu != NULL ? _sched_getcpu() : -1; }
|
||||
static int numa_node_to_cpus(int node, unsigned long *buffer, int bufferlen) {
|
||||
return _numa_node_to_cpus != NULL ? _numa_node_to_cpus(node, buffer, bufferlen) : -1;
|
||||
@ -287,63 +287,63 @@ public:
|
||||
|
||||
|
||||
class PlatformEvent : public CHeapObj<mtInternal> {
|
||||
private:
|
||||
double CachePad[4]; // increase odds that _mutex is sole occupant of cache line
|
||||
volatile int _Event;
|
||||
volatile int _nParked;
|
||||
pthread_mutex_t _mutex[1];
|
||||
pthread_cond_t _cond[1];
|
||||
double PostPad[2];
|
||||
Thread * _Assoc;
|
||||
private:
|
||||
double CachePad[4]; // increase odds that _mutex is sole occupant of cache line
|
||||
volatile int _Event;
|
||||
volatile int _nParked;
|
||||
pthread_mutex_t _mutex[1];
|
||||
pthread_cond_t _cond[1];
|
||||
double PostPad[2];
|
||||
Thread * _Assoc;
|
||||
|
||||
public: // TODO-FIXME: make dtor private
|
||||
~PlatformEvent() { guarantee(0, "invariant"); }
|
||||
public: // TODO-FIXME: make dtor private
|
||||
~PlatformEvent() { guarantee(0, "invariant"); }
|
||||
|
||||
public:
|
||||
PlatformEvent() {
|
||||
int status;
|
||||
status = pthread_cond_init (_cond, os::Linux::condAttr());
|
||||
assert_status(status == 0, status, "cond_init");
|
||||
status = pthread_mutex_init (_mutex, NULL);
|
||||
assert_status(status == 0, status, "mutex_init");
|
||||
_Event = 0;
|
||||
_nParked = 0;
|
||||
_Assoc = NULL;
|
||||
}
|
||||
public:
|
||||
PlatformEvent() {
|
||||
int status;
|
||||
status = pthread_cond_init(_cond, os::Linux::condAttr());
|
||||
assert_status(status == 0, status, "cond_init");
|
||||
status = pthread_mutex_init(_mutex, NULL);
|
||||
assert_status(status == 0, status, "mutex_init");
|
||||
_Event = 0;
|
||||
_nParked = 0;
|
||||
_Assoc = NULL;
|
||||
}
|
||||
|
||||
// Use caution with reset() and fired() -- they may require MEMBARs
|
||||
void reset() { _Event = 0; }
|
||||
int fired() { return _Event; }
|
||||
void park();
|
||||
void unpark();
|
||||
int park(jlong millis); // relative timed-wait only
|
||||
void SetAssociation(Thread * a) { _Assoc = a; }
|
||||
// Use caution with reset() and fired() -- they may require MEMBARs
|
||||
void reset() { _Event = 0; }
|
||||
int fired() { return _Event; }
|
||||
void park();
|
||||
void unpark();
|
||||
int park(jlong millis); // relative timed-wait only
|
||||
void SetAssociation(Thread * a) { _Assoc = a; }
|
||||
};
|
||||
|
||||
class PlatformParker : public CHeapObj<mtInternal> {
|
||||
protected:
|
||||
enum {
|
||||
REL_INDEX = 0,
|
||||
ABS_INDEX = 1
|
||||
};
|
||||
int _cur_index; // which cond is in use: -1, 0, 1
|
||||
pthread_mutex_t _mutex[1];
|
||||
pthread_cond_t _cond[2]; // one for relative times and one for abs.
|
||||
protected:
|
||||
enum {
|
||||
REL_INDEX = 0,
|
||||
ABS_INDEX = 1
|
||||
};
|
||||
int _cur_index; // which cond is in use: -1, 0, 1
|
||||
pthread_mutex_t _mutex[1];
|
||||
pthread_cond_t _cond[2]; // one for relative times and one for abs.
|
||||
|
||||
public: // TODO-FIXME: make dtor private
|
||||
~PlatformParker() { guarantee(0, "invariant"); }
|
||||
public: // TODO-FIXME: make dtor private
|
||||
~PlatformParker() { guarantee(0, "invariant"); }
|
||||
|
||||
public:
|
||||
PlatformParker() {
|
||||
int status;
|
||||
status = pthread_cond_init (&_cond[REL_INDEX], os::Linux::condAttr());
|
||||
assert_status(status == 0, status, "cond_init rel");
|
||||
status = pthread_cond_init (&_cond[ABS_INDEX], NULL);
|
||||
assert_status(status == 0, status, "cond_init abs");
|
||||
status = pthread_mutex_init (_mutex, NULL);
|
||||
assert_status(status == 0, status, "mutex_init");
|
||||
_cur_index = -1; // mark as unused
|
||||
}
|
||||
public:
|
||||
PlatformParker() {
|
||||
int status;
|
||||
status = pthread_cond_init(&_cond[REL_INDEX], os::Linux::condAttr());
|
||||
assert_status(status == 0, status, "cond_init rel");
|
||||
status = pthread_cond_init(&_cond[ABS_INDEX], NULL);
|
||||
assert_status(status == 0, status, "cond_init abs");
|
||||
status = pthread_mutex_init(_mutex, NULL);
|
||||
assert_status(status == 0, status, "mutex_init");
|
||||
_cur_index = -1; // mark as unused
|
||||
}
|
||||
};
|
||||
|
||||
#endif // OS_LINUX_VM_OS_LINUX_HPP
|
||||
|
||||
@ -263,4 +263,8 @@ inline bool os::supports_monotonic_clock() {
|
||||
return Linux::_clock_gettime != NULL;
|
||||
}
|
||||
|
||||
inline void os::exit(int num) {
|
||||
::exit(num);
|
||||
}
|
||||
|
||||
#endif // OS_LINUX_VM_OS_LINUX_INLINE_HPP
|
||||
|
||||
@ -250,6 +250,7 @@ int generateJvmOffsets(GEN_variant gen_variant) {
|
||||
printf("\n");
|
||||
|
||||
GEN_OFFS(nmethod, _method);
|
||||
GEN_OFFS(nmethod, _dependencies_offset);
|
||||
GEN_OFFS(nmethod, _metadata_offset);
|
||||
GEN_OFFS(nmethod, _scopes_data_offset);
|
||||
GEN_OFFS(nmethod, _scopes_pcs_offset);
|
||||
|
||||
@ -595,7 +595,7 @@ static int nmethod_info(Nmethod_t *N)
|
||||
/* scopes_pcs */
|
||||
err = ps_pread(J->P, nm + OFFSET_nmethod_scopes_pcs_offset, &N->scopes_pcs_beg, SZ32);
|
||||
CHECK_FAIL(err);
|
||||
err = ps_pread(J->P, nm + OFFSET_nmethod_handler_table_offset, &N->scopes_pcs_end, SZ32);
|
||||
err = ps_pread(J->P, nm + OFFSET_nmethod_dependencies_offset, &N->scopes_pcs_end, SZ32);
|
||||
CHECK_FAIL(err);
|
||||
|
||||
/* scopes_data */
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -36,10 +36,10 @@ class Solaris {
|
||||
private:
|
||||
|
||||
// Support for "new" libthread APIs for getting & setting thread context (2.8)
|
||||
#define TRS_VALID 0
|
||||
#define TRS_NONVOLATILE 1
|
||||
#define TRS_LWPID 2
|
||||
#define TRS_INVALID 3
|
||||
#define TRS_VALID 0
|
||||
#define TRS_NONVOLATILE 1
|
||||
#define TRS_LWPID 2
|
||||
#define TRS_INVALID 3
|
||||
|
||||
// initialized to libthread or lwp synchronization primitives depending on UseLWPSychronization
|
||||
static int_fnP_mutex_tP _mutex_lock;
|
||||
@ -61,8 +61,8 @@ class Solaris {
|
||||
typedef id_t lgrp_id_t;
|
||||
typedef int lgrp_rsrc_t;
|
||||
typedef enum lgrp_view {
|
||||
LGRP_VIEW_CALLER, /* what's available to the caller */
|
||||
LGRP_VIEW_OS /* what's available to operating system */
|
||||
LGRP_VIEW_CALLER, // what's available to the caller
|
||||
LGRP_VIEW_OS // what's available to operating system
|
||||
} lgrp_view_t;
|
||||
|
||||
typedef uint_t (*getisax_func_t)(uint32_t* array, uint_t n);
|
||||
@ -74,8 +74,8 @@ class Solaris {
|
||||
typedef int (*lgrp_children_func_t)(lgrp_cookie_t cookie, lgrp_id_t parent,
|
||||
lgrp_id_t *lgrp_array, uint_t lgrp_array_size);
|
||||
typedef int (*lgrp_resources_func_t)(lgrp_cookie_t cookie, lgrp_id_t lgrp,
|
||||
lgrp_id_t *lgrp_array, uint_t lgrp_array_size,
|
||||
lgrp_rsrc_t type);
|
||||
lgrp_id_t *lgrp_array, uint_t lgrp_array_size,
|
||||
lgrp_rsrc_t type);
|
||||
typedef int (*lgrp_nlgrps_func_t)(lgrp_cookie_t cookie);
|
||||
typedef int (*lgrp_cookie_stale_func_t)(lgrp_cookie_t cookie);
|
||||
typedef int (*meminfo_func_t)(const uint64_t inaddr[], int addr_count,
|
||||
@ -97,6 +97,8 @@ class Solaris {
|
||||
static meminfo_func_t _meminfo;
|
||||
|
||||
// Large Page Support
|
||||
static bool is_valid_page_size(size_t bytes);
|
||||
static size_t page_size_for_alignment(size_t alignment);
|
||||
static bool setup_large_pages(caddr_t start, size_t bytes, size_t align);
|
||||
|
||||
static void init_thread_fpu_state(void);
|
||||
@ -128,7 +130,7 @@ class Solaris {
|
||||
static bool valid_stack_address(Thread* thread, address sp);
|
||||
static bool valid_ucontext(Thread* thread, ucontext_t* valid, ucontext_t* suspect);
|
||||
static ucontext_t* get_valid_uc_in_signal_handler(Thread* thread,
|
||||
ucontext_t* uc);
|
||||
ucontext_t* uc);
|
||||
|
||||
static ExtendedPC ucontext_get_ExtendedPC(ucontext_t* uc);
|
||||
static intptr_t* ucontext_get_sp(ucontext_t* uc);
|
||||
@ -143,7 +145,7 @@ class Solaris {
|
||||
// os_solaris_i486.hpp and os_solaris_sparc.hpp, but that file
|
||||
// provides extensions to the os class and not the Solaris class.
|
||||
static ExtendedPC fetch_frame_from_ucontext(Thread* thread, ucontext_t* uc,
|
||||
intptr_t** ret_sp, intptr_t** ret_fp);
|
||||
intptr_t** ret_sp, intptr_t** ret_fp);
|
||||
|
||||
static void hotspot_sigmask(Thread* thread);
|
||||
|
||||
@ -216,8 +218,7 @@ class Solaris {
|
||||
static void set_mutex_destroy(int_fnP_mutex_tP func) { _mutex_destroy = func; }
|
||||
static void set_mutex_scope(int scope) { _mutex_scope = scope; }
|
||||
|
||||
static int cond_timedwait(cond_t *cv, mutex_t *mx, timestruc_t *abst)
|
||||
{ return _cond_timedwait(cv, mx, abst); }
|
||||
static int cond_timedwait(cond_t *cv, mutex_t *mx, timestruc_t *abst) { return _cond_timedwait(cv, mx, abst); }
|
||||
static int cond_wait(cond_t *cv, mutex_t *mx) { return _cond_wait(cv, mx); }
|
||||
static int cond_signal(cond_t *cv) { return _cond_signal(cv); }
|
||||
static int cond_broadcast(cond_t *cv) { return _cond_broadcast(cv); }
|
||||
@ -225,8 +226,7 @@ class Solaris {
|
||||
static int cond_destroy(cond_t *cv) { return _cond_destroy(cv); }
|
||||
static int cond_scope() { return _cond_scope; }
|
||||
|
||||
static void set_cond_timedwait(int_fnP_cond_tP_mutex_tP_timestruc_tP func)
|
||||
{ _cond_timedwait = func; }
|
||||
static void set_cond_timedwait(int_fnP_cond_tP_mutex_tP_timestruc_tP func) { _cond_timedwait = func; }
|
||||
static void set_cond_wait(int_fnP_cond_tP_mutex_tP func) { _cond_wait = func; }
|
||||
static void set_cond_signal(int_fnP_cond_tP func) { _cond_signal = func; }
|
||||
static void set_cond_broadcast(int_fnP_cond_tP func) { _cond_broadcast = func; }
|
||||
@ -247,9 +247,9 @@ class Solaris {
|
||||
static id_t lgrp_home(idtype_t type, id_t id) { return _lgrp_home != NULL ? _lgrp_home(type, id) : -1; }
|
||||
static lgrp_cookie_t lgrp_init(lgrp_view_t view) { return _lgrp_init != NULL ? _lgrp_init(view) : 0; }
|
||||
static int lgrp_fini(lgrp_cookie_t cookie) { return _lgrp_fini != NULL ? _lgrp_fini(cookie) : -1; }
|
||||
static lgrp_id_t lgrp_root(lgrp_cookie_t cookie) { return _lgrp_root != NULL ? _lgrp_root(cookie) : -1; };
|
||||
static lgrp_id_t lgrp_root(lgrp_cookie_t cookie) { return _lgrp_root != NULL ? _lgrp_root(cookie) : -1; }
|
||||
static int lgrp_children(lgrp_cookie_t cookie, lgrp_id_t parent,
|
||||
lgrp_id_t *lgrp_array, uint_t lgrp_array_size) {
|
||||
lgrp_id_t *lgrp_array, uint_t lgrp_array_size) {
|
||||
return _lgrp_children != NULL ? _lgrp_children(cookie, parent, lgrp_array, lgrp_array_size) : -1;
|
||||
}
|
||||
static int lgrp_resources(lgrp_cookie_t cookie, lgrp_id_t lgrp,
|
||||
@ -269,8 +269,8 @@ class Solaris {
|
||||
|
||||
static void set_meminfo(meminfo_func_t func) { _meminfo = func; }
|
||||
static int meminfo (const uint64_t inaddr[], int addr_count,
|
||||
const uint_t info_req[], int info_count,
|
||||
uint64_t outdata[], uint_t validity[]) {
|
||||
const uint_t info_req[], int info_count,
|
||||
uint64_t outdata[], uint_t validity[]) {
|
||||
return _meminfo != NULL ? _meminfo(inaddr, addr_count, info_req, info_count,
|
||||
outdata, validity) : -1;
|
||||
}
|
||||
@ -300,57 +300,57 @@ class Solaris {
|
||||
};
|
||||
|
||||
class PlatformEvent : public CHeapObj<mtInternal> {
|
||||
private:
|
||||
double CachePad[4]; // increase odds that _mutex is sole occupant of cache line
|
||||
volatile int _Event;
|
||||
int _nParked;
|
||||
int _pipev[2];
|
||||
mutex_t _mutex[1];
|
||||
cond_t _cond[1];
|
||||
double PostPad[2];
|
||||
private:
|
||||
double CachePad[4]; // increase odds that _mutex is sole occupant of cache line
|
||||
volatile int _Event;
|
||||
int _nParked;
|
||||
int _pipev[2];
|
||||
mutex_t _mutex[1];
|
||||
cond_t _cond[1];
|
||||
double PostPad[2];
|
||||
|
||||
protected:
|
||||
// Defining a protected ctor effectively gives us an abstract base class.
|
||||
// That is, a PlatformEvent can never be instantiated "naked" but only
|
||||
// as a part of a ParkEvent (recall that ParkEvent extends PlatformEvent).
|
||||
// TODO-FIXME: make dtor private
|
||||
~PlatformEvent() { guarantee(0, "invariant"); }
|
||||
PlatformEvent() {
|
||||
int status;
|
||||
status = os::Solaris::cond_init(_cond);
|
||||
assert_status(status == 0, status, "cond_init");
|
||||
status = os::Solaris::mutex_init(_mutex);
|
||||
assert_status(status == 0, status, "mutex_init");
|
||||
_Event = 0;
|
||||
_nParked = 0;
|
||||
_pipev[0] = _pipev[1] = -1;
|
||||
}
|
||||
protected:
|
||||
// Defining a protected ctor effectively gives us an abstract base class.
|
||||
// That is, a PlatformEvent can never be instantiated "naked" but only
|
||||
// as a part of a ParkEvent (recall that ParkEvent extends PlatformEvent).
|
||||
// TODO-FIXME: make dtor private
|
||||
~PlatformEvent() { guarantee(0, "invariant"); }
|
||||
PlatformEvent() {
|
||||
int status;
|
||||
status = os::Solaris::cond_init(_cond);
|
||||
assert_status(status == 0, status, "cond_init");
|
||||
status = os::Solaris::mutex_init(_mutex);
|
||||
assert_status(status == 0, status, "mutex_init");
|
||||
_Event = 0;
|
||||
_nParked = 0;
|
||||
_pipev[0] = _pipev[1] = -1;
|
||||
}
|
||||
|
||||
public:
|
||||
// Exercise caution using reset() and fired() -- they may require MEMBARs
|
||||
void reset() { _Event = 0; }
|
||||
int fired() { return _Event; }
|
||||
void park();
|
||||
int park(jlong millis);
|
||||
void unpark();
|
||||
public:
|
||||
// Exercise caution using reset() and fired() -- they may require MEMBARs
|
||||
void reset() { _Event = 0; }
|
||||
int fired() { return _Event; }
|
||||
void park();
|
||||
int park(jlong millis);
|
||||
void unpark();
|
||||
};
|
||||
|
||||
class PlatformParker : public CHeapObj<mtInternal> {
|
||||
protected:
|
||||
mutex_t _mutex[1];
|
||||
cond_t _cond[1];
|
||||
protected:
|
||||
mutex_t _mutex[1];
|
||||
cond_t _cond[1];
|
||||
|
||||
public: // TODO-FIXME: make dtor private
|
||||
~PlatformParker() { guarantee(0, "invariant"); }
|
||||
public: // TODO-FIXME: make dtor private
|
||||
~PlatformParker() { guarantee(0, "invariant"); }
|
||||
|
||||
public:
|
||||
PlatformParker() {
|
||||
int status;
|
||||
status = os::Solaris::cond_init(_cond);
|
||||
assert_status(status == 0, status, "cond_init");
|
||||
status = os::Solaris::mutex_init(_mutex);
|
||||
assert_status(status == 0, status, "mutex_init");
|
||||
}
|
||||
public:
|
||||
PlatformParker() {
|
||||
int status;
|
||||
status = os::Solaris::cond_init(_cond);
|
||||
assert_status(status == 0, status, "cond_init");
|
||||
status = os::Solaris::mutex_init(_mutex);
|
||||
assert_status(status == 0, status, "mutex_init");
|
||||
}
|
||||
};
|
||||
|
||||
#endif // OS_SOLARIS_VM_OS_SOLARIS_HPP
|
||||
|
||||
@ -157,4 +157,8 @@ inline bool os::supports_monotonic_clock() {
|
||||
return true;
|
||||
}
|
||||
|
||||
inline void os::exit(int num) {
|
||||
::exit(num);
|
||||
}
|
||||
|
||||
#endif // OS_SOLARIS_VM_OS_SOLARIS_INLINE_HPP
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -36,6 +36,7 @@ static const char* path_separator() { return ";"; }
|
||||
|
||||
class win32 {
|
||||
friend class os;
|
||||
friend unsigned __stdcall java_start(class Thread*);
|
||||
|
||||
protected:
|
||||
static int _vm_page_size;
|
||||
@ -47,6 +48,7 @@ class win32 {
|
||||
static bool _is_nt;
|
||||
static bool _is_windows_2003;
|
||||
static bool _is_windows_server;
|
||||
static bool _has_exit_bug;
|
||||
static bool _has_performance_count;
|
||||
|
||||
static void print_windows_version(outputStream* st);
|
||||
@ -69,8 +71,12 @@ class win32 {
|
||||
// load dll from Windows system directory or Windows directory
|
||||
static HINSTANCE load_Windows_dll(const char* name, char *ebuf, int ebuflen);
|
||||
|
||||
private:
|
||||
static void initialize_performance_counter();
|
||||
private:
|
||||
enum Ept { EPT_THREAD, EPT_PROCESS, EPT_PROCESS_DIE };
|
||||
// Wrapper around _endthreadex(), exit() and _exit()
|
||||
static int exit_process_or_thread(Ept what, int exit_code);
|
||||
|
||||
static void initialize_performance_counter();
|
||||
|
||||
public:
|
||||
// Generic interface:
|
||||
@ -88,6 +94,9 @@ class win32 {
|
||||
// Tells whether the platform is Windows 2003
|
||||
static bool is_windows_2003() { return _is_windows_2003; }
|
||||
|
||||
// Tells whether there can be the race bug during process exit on this platform
|
||||
static bool has_exit_bug() { return _has_exit_bug; }
|
||||
|
||||
// Returns the byte size of a virtual memory page
|
||||
static int vm_page_size() { return _vm_page_size; }
|
||||
|
||||
|
||||
@ -100,6 +100,10 @@ inline bool os::supports_monotonic_clock() {
|
||||
return win32::_has_performance_count;
|
||||
}
|
||||
|
||||
inline void os::exit(int num) {
|
||||
win32::exit_process_or_thread(win32::EPT_PROCESS, num);
|
||||
}
|
||||
|
||||
#define CALL_TEST_FUNC_WITH_WRAPPER_IF_NEEDED(f) \
|
||||
os::win32::call_test_func_with_wrapper(f)
|
||||
|
||||
|
||||
@ -1,156 +0,0 @@
|
||||
import static java.nio.file.FileVisitResult.CONTINUE;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.nio.file.FileSystems;
|
||||
import java.nio.file.FileVisitResult;
|
||||
import java.nio.file.Files;
|
||||
import java.nio.file.Path;
|
||||
import java.nio.file.attribute.BasicFileAttributes;
|
||||
import java.util.Stack;
|
||||
import java.util.Vector;
|
||||
|
||||
public class FileTreeCreatorVC7 extends FileTreeCreator {
|
||||
|
||||
public FileTreeCreatorVC7(Path startDir, Vector<BuildConfig> allConfigs, WinGammaPlatform wg) {
|
||||
super(startDir, allConfigs, wg);
|
||||
}
|
||||
|
||||
@Override
|
||||
public FileVisitResult visitFile(Path file, BasicFileAttributes attr) {
|
||||
DirAttributes currentFileAttr = attributes.peek().clone();
|
||||
boolean usePch = false;
|
||||
boolean disablePch = false;
|
||||
boolean useIgnore = false;
|
||||
String fileName = file.getFileName().toString();
|
||||
|
||||
// usePch applies to all configs for a file.
|
||||
if (fileName.equals(BuildConfig.getFieldString(null, "UseToGeneratePch"))) {
|
||||
usePch = true;
|
||||
}
|
||||
|
||||
for (BuildConfig cfg : allConfigs) {
|
||||
if (cfg.lookupHashFieldInContext("IgnoreFile", fileName) != null) {
|
||||
useIgnore = true;
|
||||
currentFileAttr.setIgnore(cfg);
|
||||
} else if (cfg.matchesIgnoredPath(file.toAbsolutePath().toString())) {
|
||||
useIgnore = true;
|
||||
currentFileAttr.setIgnore(cfg);
|
||||
}
|
||||
|
||||
if (cfg.lookupHashFieldInContext("DisablePch", fileName) != null) {
|
||||
disablePch = true;
|
||||
currentFileAttr.setDisablePch(cfg);
|
||||
}
|
||||
|
||||
Vector<String> rv = new Vector<String>();
|
||||
cfg.collectRelevantVectors(rv, "AdditionalFile");
|
||||
for(String addFile : rv) {
|
||||
if (addFile.equals(fileName)) {
|
||||
// supress any ignore
|
||||
currentFileAttr.removeFromIgnored(cfg);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (!useIgnore && !disablePch && !usePch) {
|
||||
wg.tag("File", new String[] { "RelativePath", vcProjLocation.relativize(file).toString()});
|
||||
} else {
|
||||
wg.startTag(
|
||||
"File",
|
||||
new String[] { "RelativePath", vcProjLocation.relativize(file).toString()});
|
||||
|
||||
for (BuildConfig cfg : allConfigs) {
|
||||
boolean ignore = currentFileAttr.hasIgnore(cfg);
|
||||
String [] fileConfAttr;
|
||||
|
||||
if (ignore) {
|
||||
fileConfAttr = new String[] {"Name", cfg.get("Name"), "ExcludedFromBuild", "TRUE" };
|
||||
} else {
|
||||
fileConfAttr = new String[] {"Name", cfg.get("Name")};
|
||||
}
|
||||
|
||||
if (!disablePch && !usePch && !ignore) {
|
||||
continue;
|
||||
} else if (!disablePch && !usePch) {
|
||||
wg.tag("FileConfiguration", fileConfAttr);
|
||||
} else {
|
||||
wg.startTag("FileConfiguration", fileConfAttr);
|
||||
if (usePch) {
|
||||
// usePch always applies to all configs, might not always be so.
|
||||
wg.tag("Tool", new String[] {
|
||||
"Name", "VCCLCompilerTool", "UsePrecompiledHeader",
|
||||
"1" });
|
||||
assert(!disablePch);
|
||||
}
|
||||
if (disablePch) {
|
||||
if (currentFileAttr.hasDisablePch(cfg)) {
|
||||
wg.tag("Tool", new String[] {
|
||||
"Name", "VCCLCompilerTool", "UsePrecompiledHeader",
|
||||
"0" });
|
||||
}
|
||||
assert(!usePch);
|
||||
}
|
||||
wg.endTag();
|
||||
}
|
||||
}
|
||||
wg.endTag();
|
||||
}
|
||||
|
||||
return CONTINUE;
|
||||
}
|
||||
|
||||
@Override
|
||||
public FileVisitResult preVisitDirectory(Path path, BasicFileAttributes attrs)
|
||||
throws IOException {
|
||||
Boolean hide = false;
|
||||
DirAttributes newAttr = attributes.peek().clone();
|
||||
|
||||
String rPath;
|
||||
if (path.toAbsolutePath().toString().equals(this.startDir.toAbsolutePath().toString())){
|
||||
rPath = startDir.toString();
|
||||
} else {
|
||||
rPath = path.getFileName().toString();
|
||||
}
|
||||
|
||||
// check per config ignorePaths!
|
||||
for (BuildConfig cfg : allConfigs) {
|
||||
if (cfg.matchesIgnoredPath(path.toAbsolutePath().toString())) {
|
||||
newAttr.setIgnore(cfg);
|
||||
}
|
||||
|
||||
// Hide is always on all configs. And additional files are never hiddden
|
||||
if (cfg.matchesHidePath(path.toAbsolutePath().toString())) {
|
||||
hide = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (!hide) {
|
||||
wg.startTag("Filter", new String[] {
|
||||
"Name", rPath});
|
||||
|
||||
attributes.push(newAttr);
|
||||
return super.preVisitDirectory(path, attrs);
|
||||
} else {
|
||||
return FileVisitResult.SKIP_SUBTREE;
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public FileVisitResult postVisitDirectory(Path dir, IOException exc) {
|
||||
//end matching attributes set by ignorepath
|
||||
wg.endTag();
|
||||
attributes.pop();
|
||||
|
||||
return CONTINUE;
|
||||
}
|
||||
|
||||
@Override
|
||||
public FileVisitResult visitFileFailed(Path file, IOException exc) {
|
||||
return CONTINUE;
|
||||
}
|
||||
|
||||
public void writeFileTree() throws IOException {
|
||||
Files.walkFileTree(this.startDir, this);
|
||||
}
|
||||
}
|
||||
@ -33,7 +33,7 @@ import java.util.LinkedList;
|
||||
import java.util.UUID;
|
||||
import java.util.Vector;
|
||||
|
||||
public class WinGammaPlatformVC10 extends WinGammaPlatformVC7 {
|
||||
public class WinGammaPlatformVC10 extends WinGammaPlatform {
|
||||
|
||||
|
||||
LinkedList <String>filters = new LinkedList<String>();
|
||||
|
||||
@ -1,353 +0,0 @@
|
||||
/*
|
||||
* Copyright (c) 2005, 2013, 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.
|
||||
*
|
||||
* 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.
|
||||
*
|
||||
*/
|
||||
|
||||
import java.io.FileWriter;
|
||||
import java.io.IOException;
|
||||
import java.io.PrintWriter;
|
||||
import java.nio.file.FileSystems;
|
||||
import java.util.Vector;
|
||||
|
||||
public class WinGammaPlatformVC7 extends WinGammaPlatform {
|
||||
|
||||
// TODO How about moving all globals configs to its own BuildConfig?
|
||||
|
||||
String projectVersion() {
|
||||
return "7.10";
|
||||
};
|
||||
|
||||
public void writeProjectFile(String projectFileName, String projectName,
|
||||
Vector<BuildConfig> allConfigs) throws IOException {
|
||||
System.out.println();
|
||||
System.out.println(" Writing .vcproj file: " + projectFileName);
|
||||
// If we got this far without an error, we're safe to actually
|
||||
// write the .vcproj file
|
||||
printWriter = new PrintWriter(new FileWriter(projectFileName));
|
||||
|
||||
printWriter
|
||||
.println("<?xml version=\"1.0\" encoding=\"windows-1251\"?>");
|
||||
startTag("VisualStudioProject", new String[] { "ProjectType",
|
||||
"Visual C++", "Version", projectVersion(), "Name", projectName,
|
||||
"ProjectGUID", "{8822CB5C-1C41-41C2-8493-9F6E1994338B}",
|
||||
"SccProjectName", "", "SccLocalPath", "" });
|
||||
startTag("Platforms");
|
||||
tag("Platform",
|
||||
new String[] { "Name",
|
||||
(String) BuildConfig.getField(null, "PlatformName") });
|
||||
endTag();
|
||||
|
||||
startTag("Configurations");
|
||||
|
||||
for (BuildConfig cfg : allConfigs) {
|
||||
writeConfiguration(cfg);
|
||||
}
|
||||
|
||||
endTag();
|
||||
|
||||
tag("References");
|
||||
|
||||
writeFiles(allConfigs);
|
||||
|
||||
tag("Globals");
|
||||
|
||||
endTag();
|
||||
printWriter.close();
|
||||
|
||||
System.out.println(" Done.");
|
||||
}
|
||||
|
||||
void writeCustomToolConfig(Vector<BuildConfig> configs, String[] customToolAttrs) {
|
||||
for (BuildConfig cfg : configs) {
|
||||
startTag("FileConfiguration",
|
||||
new String[] { "Name", (String) cfg.get("Name") });
|
||||
tag("Tool", customToolAttrs);
|
||||
|
||||
endTag();
|
||||
}
|
||||
}
|
||||
|
||||
void writeFiles(Vector<BuildConfig> allConfigs) {
|
||||
|
||||
// This code assummes there are no config specific includes.
|
||||
startTag("Files");
|
||||
String sourceBase = BuildConfig.getFieldString(null, "SourceBase");
|
||||
|
||||
// Use first config for all global absolute includes.
|
||||
BuildConfig baseConfig = allConfigs.firstElement();
|
||||
Vector<String> rv = new Vector<String>();
|
||||
|
||||
// Then use first config for all relative includes
|
||||
Vector<String> ri = new Vector<String>();
|
||||
baseConfig.collectRelevantVectors(ri, "RelativeSrcInclude");
|
||||
for (String f : ri) {
|
||||
rv.add(sourceBase + Util.sep + f);
|
||||
}
|
||||
|
||||
baseConfig.collectRelevantVectors(rv, "AbsoluteSrcInclude");
|
||||
|
||||
handleIncludes(rv, allConfigs);
|
||||
|
||||
startTag("Filter", new String[] { "Name", "Resource Files", "Filter",
|
||||
"ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe" });
|
||||
endTag();
|
||||
|
||||
endTag();
|
||||
}
|
||||
|
||||
// Will visit file tree for each include
|
||||
private void handleIncludes(Vector<String> includes, Vector<BuildConfig> allConfigs) {
|
||||
for (String path : includes) {
|
||||
FileTreeCreatorVC7 ftc = new FileTreeCreatorVC7(FileSystems.getDefault().getPath(path) , allConfigs, this);
|
||||
try {
|
||||
ftc.writeFileTree();
|
||||
} catch (IOException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void writeConfiguration(BuildConfig cfg) {
|
||||
startTag("Configuration", new String[] { "Name", cfg.get("Name"),
|
||||
"OutputDirectory", cfg.get("OutputDir"),
|
||||
"IntermediateDirectory", cfg.get("OutputDir"),
|
||||
"ConfigurationType", "2", "UseOfMFC", "0",
|
||||
"ATLMinimizesCRunTimeLibraryUsage", "FALSE" });
|
||||
|
||||
tagV("Tool", cfg.getV("CompilerFlags"));
|
||||
|
||||
tag("Tool", new String[] { "Name", "VCCustomBuildTool" });
|
||||
|
||||
tagV("Tool", cfg.getV("LinkerFlags"));
|
||||
|
||||
String postBuildCmd = BuildConfig.getFieldString(null,
|
||||
"PostbuildCommand");
|
||||
if (postBuildCmd != null) {
|
||||
tag("Tool",
|
||||
new String[] {
|
||||
"Name",
|
||||
"VCPostBuildEventTool",
|
||||
"Description",
|
||||
BuildConfig
|
||||
.getFieldString(null, "PostbuildDescription"),
|
||||
// Caution: String.replace(String,String) is available
|
||||
// from JDK5 onwards only
|
||||
"CommandLine",
|
||||
cfg.expandFormat(postBuildCmd.replace("\t",
|
||||
"
")) });
|
||||
}
|
||||
|
||||
tag("Tool", new String[] { "Name", "VCPreBuildEventTool" });
|
||||
|
||||
tag("Tool",
|
||||
new String[] {
|
||||
"Name",
|
||||
"VCPreLinkEventTool",
|
||||
"Description",
|
||||
BuildConfig.getFieldString(null, "PrelinkDescription"),
|
||||
// Caution: String.replace(String,String) is available
|
||||
// from JDK5 onwards only
|
||||
"CommandLine",
|
||||
cfg.expandFormat(BuildConfig.getFieldString(null,
|
||||
"PrelinkCommand").replace("\t", "
")) });
|
||||
|
||||
tag("Tool", new String[] { "Name", "VCResourceCompilerTool",
|
||||
"PreprocessorDefinitions", "NDEBUG", "Culture", "1033" });
|
||||
|
||||
tag("Tool", new String[] { "Name", "VCMIDLTool",
|
||||
"PreprocessorDefinitions", "NDEBUG", "MkTypLibCompatible",
|
||||
"TRUE", "SuppressStartupBanner", "TRUE", "TargetEnvironment",
|
||||
"1", "TypeLibraryName",
|
||||
cfg.get("OutputDir") + Util.sep + "vm.tlb", "HeaderFileName",
|
||||
"" });
|
||||
|
||||
endTag();
|
||||
}
|
||||
|
||||
|
||||
|
||||
protected String getProjectExt() {
|
||||
return ".vcproj";
|
||||
}
|
||||
}
|
||||
|
||||
class CompilerInterfaceVC7 extends CompilerInterface {
|
||||
void getBaseCompilerFlags_common(Vector defines, Vector includes,
|
||||
String outDir, Vector rv) {
|
||||
|
||||
// advanced M$ IDE (2003) can only recognize name if it's first or
|
||||
// second attribute in the tag - go guess
|
||||
addAttr(rv, "Name", "VCCLCompilerTool");
|
||||
addAttr(rv, "AdditionalIncludeDirectories", Util.join(",", includes));
|
||||
addAttr(rv, "PreprocessorDefinitions",
|
||||
Util.join(";", defines).replace("\"", """));
|
||||
addAttr(rv, "PrecompiledHeaderThrough", "precompiled.hpp");
|
||||
addAttr(rv, "PrecompiledHeaderFile", outDir + Util.sep + "vm.pch");
|
||||
addAttr(rv, "AssemblerListingLocation", outDir);
|
||||
addAttr(rv, "ObjectFile", outDir + Util.sep);
|
||||
addAttr(rv, "ProgramDataBaseFileName", outDir + Util.sep + "jvm.pdb");
|
||||
// Set /nologo optin
|
||||
addAttr(rv, "SuppressStartupBanner", "TRUE");
|
||||
// Surpass the default /Tc or /Tp. 0 is compileAsDefault
|
||||
addAttr(rv, "CompileAs", "0");
|
||||
// Set /W3 option. 3 is warningLevel_3
|
||||
addAttr(rv, "WarningLevel", "3");
|
||||
// Set /WX option,
|
||||
addAttr(rv, "WarnAsError", "TRUE");
|
||||
// Set /GS option
|
||||
addAttr(rv, "BufferSecurityCheck", "FALSE");
|
||||
// Set /Zi option. 3 is debugEnabled
|
||||
addAttr(rv, "DebugInformationFormat", "3");
|
||||
}
|
||||
|
||||
Vector getBaseCompilerFlags(Vector defines, Vector includes, String outDir) {
|
||||
Vector rv = new Vector();
|
||||
|
||||
getBaseCompilerFlags_common(defines, includes, outDir, rv);
|
||||
// Set /Yu option. 3 is pchUseUsingSpecific
|
||||
// Note: Starting VC8 pchUseUsingSpecific is 2 !!!
|
||||
addAttr(rv, "UsePrecompiledHeader", "3");
|
||||
// Set /EHsc- option
|
||||
addAttr(rv, "ExceptionHandling", "FALSE");
|
||||
|
||||
return rv;
|
||||
}
|
||||
|
||||
Vector getBaseLinkerFlags(String outDir, String outDll, String platformName) {
|
||||
Vector rv = new Vector();
|
||||
|
||||
addAttr(rv, "Name", "VCLinkerTool");
|
||||
addAttr(rv, "AdditionalOptions",
|
||||
"/export:JNI_GetDefaultJavaVMInitArgs "
|
||||
+ "/export:JNI_CreateJavaVM "
|
||||
+ "/export:JVM_FindClassFromBootLoader "
|
||||
+ "/export:JNI_GetCreatedJavaVMs "
|
||||
+ "/export:jio_snprintf /export:jio_printf "
|
||||
+ "/export:jio_fprintf /export:jio_vfprintf "
|
||||
+ "/export:jio_vsnprintf "
|
||||
+ "/export:JVM_GetVersionInfo "
|
||||
+ "/export:JVM_GetThreadStateNames "
|
||||
+ "/export:JVM_GetThreadStateValues "
|
||||
+ "/export:JVM_InitAgentProperties ");
|
||||
addAttr(rv, "AdditionalDependencies", "Wsock32.lib winmm.lib");
|
||||
addAttr(rv, "OutputFile", outDll);
|
||||
// Set /INCREMENTAL option. 1 is linkIncrementalNo
|
||||
addAttr(rv, "LinkIncremental", "1");
|
||||
addAttr(rv, "SuppressStartupBanner", "TRUE");
|
||||
addAttr(rv, "ModuleDefinitionFile", outDir + Util.sep + "vm.def");
|
||||
addAttr(rv, "ProgramDatabaseFile", outDir + Util.sep + "jvm.pdb");
|
||||
// Set /SUBSYSTEM option. 2 is subSystemWindows
|
||||
addAttr(rv, "SubSystem", "2");
|
||||
addAttr(rv, "BaseAddress", "0x8000000");
|
||||
addAttr(rv, "ImportLibrary", outDir + Util.sep + "jvm.lib");
|
||||
if (platformName.equals("Win32")) {
|
||||
// Set /MACHINE option. 1 is X86
|
||||
addAttr(rv, "TargetMachine", "1");
|
||||
} else {
|
||||
// Set /MACHINE option. 17 is X64
|
||||
addAttr(rv, "TargetMachine", "17");
|
||||
}
|
||||
|
||||
return rv;
|
||||
}
|
||||
|
||||
void getDebugCompilerFlags_common(String opt, Vector rv) {
|
||||
|
||||
// Set /On option
|
||||
addAttr(rv, "Optimization", opt);
|
||||
// Set /FR option. 1 is brAllInfo
|
||||
addAttr(rv, "BrowseInformation", "1");
|
||||
addAttr(rv, "BrowseInformationFile", "$(IntDir)" + Util.sep);
|
||||
// Set /MD option. 2 is rtMultiThreadedDLL
|
||||
addAttr(rv, "RuntimeLibrary", "2");
|
||||
// Set /Oy- option
|
||||
addAttr(rv, "OmitFramePointers", "FALSE");
|
||||
|
||||
}
|
||||
|
||||
Vector getDebugCompilerFlags(String opt, String platformName) {
|
||||
Vector rv = new Vector();
|
||||
|
||||
getDebugCompilerFlags_common(opt, rv);
|
||||
|
||||
return rv;
|
||||
}
|
||||
|
||||
Vector getDebugLinkerFlags() {
|
||||
Vector rv = new Vector();
|
||||
|
||||
addAttr(rv, "GenerateDebugInformation", "TRUE"); // == /DEBUG option
|
||||
|
||||
return rv;
|
||||
}
|
||||
|
||||
void getAdditionalNonKernelLinkerFlags(Vector rv) {
|
||||
extAttr(rv, "AdditionalOptions", "/export:AsyncGetCallTrace ");
|
||||
}
|
||||
|
||||
void getProductCompilerFlags_common(Vector rv) {
|
||||
// Set /O2 option. 2 is optimizeMaxSpeed
|
||||
addAttr(rv, "Optimization", "2");
|
||||
// Set /Oy- option
|
||||
addAttr(rv, "OmitFramePointers", "FALSE");
|
||||
// Set /Ob option. 1 is expandOnlyInline
|
||||
addAttr(rv, "InlineFunctionExpansion", "1");
|
||||
// Set /GF option.
|
||||
addAttr(rv, "StringPooling", "TRUE");
|
||||
// Set /MD option. 2 is rtMultiThreadedDLL
|
||||
addAttr(rv, "RuntimeLibrary", "2");
|
||||
// Set /Gy option
|
||||
addAttr(rv, "EnableFunctionLevelLinking", "TRUE");
|
||||
}
|
||||
|
||||
Vector getProductCompilerFlags() {
|
||||
Vector rv = new Vector();
|
||||
|
||||
getProductCompilerFlags_common(rv);
|
||||
|
||||
return rv;
|
||||
}
|
||||
|
||||
Vector getProductLinkerFlags() {
|
||||
Vector rv = new Vector();
|
||||
|
||||
// Set /OPT:REF option. 2 is optReferences
|
||||
addAttr(rv, "OptimizeReferences", "2");
|
||||
// Set /OPT:optFolding option. 2 is optFolding
|
||||
addAttr(rv, "EnableCOMDATFolding", "2");
|
||||
|
||||
return rv;
|
||||
}
|
||||
|
||||
String getOptFlag() {
|
||||
return "2";
|
||||
}
|
||||
|
||||
String getNoOptFlag() {
|
||||
return "0";
|
||||
}
|
||||
|
||||
String makeCfgName(String flavourBuild, String platform) {
|
||||
return flavourBuild + "|" + platform;
|
||||
}
|
||||
|
||||
}
|
||||
@ -1,68 +0,0 @@
|
||||
/*
|
||||
* Copyright (c) 2005, 2010, 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.
|
||||
*
|
||||
* 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.
|
||||
*
|
||||
*/
|
||||
|
||||
import java.util.Vector;
|
||||
|
||||
public class WinGammaPlatformVC8 extends WinGammaPlatformVC7 {
|
||||
|
||||
String projectVersion() {return "8.00";};
|
||||
|
||||
}
|
||||
|
||||
class CompilerInterfaceVC8 extends CompilerInterfaceVC7 {
|
||||
|
||||
Vector getBaseCompilerFlags(Vector defines, Vector includes, String outDir) {
|
||||
Vector rv = new Vector();
|
||||
|
||||
getBaseCompilerFlags_common(defines,includes, outDir, rv);
|
||||
// Set /Yu option. 2 is pchUseUsingSpecific
|
||||
addAttr(rv, "UsePrecompiledHeader", "2");
|
||||
// Set /EHsc- option. 0 is cppExceptionHandlingNo
|
||||
addAttr(rv, "ExceptionHandling", "0");
|
||||
|
||||
// enable multi process builds
|
||||
extAttr(rv, "AdditionalOptions", "/MP");
|
||||
|
||||
return rv;
|
||||
}
|
||||
|
||||
|
||||
Vector getDebugCompilerFlags(String opt, String platformName) {
|
||||
Vector rv = new Vector();
|
||||
|
||||
getDebugCompilerFlags_common(opt,rv);
|
||||
|
||||
return rv;
|
||||
}
|
||||
|
||||
Vector getProductCompilerFlags() {
|
||||
Vector rv = new Vector();
|
||||
|
||||
getProductCompilerFlags_common(rv);
|
||||
|
||||
return rv;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@ -39,7 +39,6 @@ class ciField : public ResourceObj {
|
||||
CI_PACKAGE_ACCESS
|
||||
friend class ciEnv;
|
||||
friend class ciInstanceKlass;
|
||||
friend class NonStaticFieldFiller;
|
||||
|
||||
private:
|
||||
ciFlags _flags;
|
||||
|
||||
@ -44,7 +44,7 @@
|
||||
//
|
||||
// Loaded instance klass.
|
||||
ciInstanceKlass::ciInstanceKlass(KlassHandle h_k) :
|
||||
ciKlass(h_k), _non_static_fields(NULL)
|
||||
ciKlass(h_k)
|
||||
{
|
||||
assert(get_Klass()->oop_is_instance(), "wrong type");
|
||||
assert(get_instanceKlass()->is_loaded(), "must be at least loaded");
|
||||
@ -407,37 +407,6 @@ ciField* ciInstanceKlass::get_field_by_name(ciSymbol* name, ciSymbol* signature,
|
||||
return field;
|
||||
}
|
||||
|
||||
// ------------------------------------------------------------------
|
||||
// ciInstanceKlass::non_static_fields.
|
||||
|
||||
class NonStaticFieldFiller: public FieldClosure {
|
||||
GrowableArray<ciField*>* _arr;
|
||||
ciEnv* _curEnv;
|
||||
public:
|
||||
NonStaticFieldFiller(ciEnv* curEnv, GrowableArray<ciField*>* arr) :
|
||||
_curEnv(curEnv), _arr(arr)
|
||||
{}
|
||||
void do_field(fieldDescriptor* fd) {
|
||||
ciField* field = new (_curEnv->arena()) ciField(fd);
|
||||
_arr->append(field);
|
||||
}
|
||||
};
|
||||
|
||||
GrowableArray<ciField*>* ciInstanceKlass::non_static_fields() {
|
||||
if (_non_static_fields == NULL) {
|
||||
VM_ENTRY_MARK;
|
||||
ciEnv* curEnv = ciEnv::current();
|
||||
InstanceKlass* ik = get_instanceKlass();
|
||||
int max_n_fields = ik->java_fields_count();
|
||||
|
||||
Arena* arena = curEnv->arena();
|
||||
_non_static_fields =
|
||||
new (arena) GrowableArray<ciField*>(arena, max_n_fields, 0, NULL);
|
||||
NonStaticFieldFiller filler(curEnv, _non_static_fields);
|
||||
ik->do_nonstatic_fields(&filler);
|
||||
}
|
||||
return _non_static_fields;
|
||||
}
|
||||
|
||||
static int sort_field_by_offset(ciField** a, ciField** b) {
|
||||
return (*a)->offset_in_bytes() - (*b)->offset_in_bytes();
|
||||
|
||||
@ -71,8 +71,6 @@ private:
|
||||
// Itsef: more than one implementors.
|
||||
ciInstanceKlass* _implementor;
|
||||
|
||||
GrowableArray<ciField*>* _non_static_fields;
|
||||
|
||||
protected:
|
||||
ciInstanceKlass(KlassHandle h_k);
|
||||
ciInstanceKlass(ciSymbol* name, jobject loader, jobject protection_domain);
|
||||
@ -181,8 +179,6 @@ public:
|
||||
ciField* get_field_by_offset(int field_offset, bool is_static);
|
||||
ciField* get_field_by_name(ciSymbol* name, ciSymbol* signature, bool is_static);
|
||||
|
||||
GrowableArray<ciField*>* non_static_fields();
|
||||
|
||||
// total number of nonstatic fields (including inherited):
|
||||
int nof_nonstatic_fields() {
|
||||
if (_nonstatic_fields == NULL)
|
||||
|
||||
@ -1364,8 +1364,6 @@ void nmethod::invalidate_osr_method() {
|
||||
// Remove from list of active nmethods
|
||||
if (method() != NULL)
|
||||
method()->method_holder()->remove_osr_nmethod(this);
|
||||
// Set entry as invalid
|
||||
_entry_bci = InvalidOSREntryBci;
|
||||
}
|
||||
|
||||
void nmethod::log_state_change() const {
|
||||
|
||||
@ -202,13 +202,6 @@ class nmethod : public CodeBlob {
|
||||
bool _oops_are_stale; // indicates that it's no longer safe to access oops section
|
||||
#endif
|
||||
|
||||
enum { in_use = 0, // executable nmethod
|
||||
not_entrant = 1, // marked for deoptimization but activations may still exist,
|
||||
// will be transformed to zombie when all activations are gone
|
||||
zombie = 2, // no activations exist, nmethod is ready for purge
|
||||
unloaded = 3 }; // there should be no activations, should not be called,
|
||||
// will be transformed to zombie immediately
|
||||
|
||||
jbyte _scavenge_root_state;
|
||||
|
||||
#if INCLUDE_RTM_OPT
|
||||
@ -431,6 +424,13 @@ class nmethod : public CodeBlob {
|
||||
address entry_point() const { return _entry_point; } // normal entry point
|
||||
address verified_entry_point() const { return _verified_entry_point; } // if klass is correct
|
||||
|
||||
enum { in_use = 0, // executable nmethod
|
||||
not_entrant = 1, // marked for deoptimization but activations may still exist,
|
||||
// will be transformed to zombie when all activations are gone
|
||||
zombie = 2, // no activations exist, nmethod is ready for purge
|
||||
unloaded = 3 }; // there should be no activations, should not be called,
|
||||
// will be transformed to zombie immediately
|
||||
|
||||
// flag accessing and manipulation
|
||||
bool is_in_use() const { return _state == in_use; }
|
||||
bool is_alive() const { return _state == in_use || _state == not_entrant; }
|
||||
@ -759,7 +759,7 @@ public:
|
||||
// support for code generation
|
||||
static int verified_entry_point_offset() { return offset_of(nmethod, _verified_entry_point); }
|
||||
static int osr_entry_point_offset() { return offset_of(nmethod, _osr_entry_point); }
|
||||
static int entry_bci_offset() { return offset_of(nmethod, _entry_bci); }
|
||||
static int state_offset() { return offset_of(nmethod, _state); }
|
||||
|
||||
// RedefineClasses support. Mark metadata in nmethods as on_stack so that
|
||||
// redefine classes doesn't purge it.
|
||||
|
||||
@ -4737,7 +4737,7 @@ void G1PrintRegionLivenessInfoClosure::get_hum_bytes(size_t* used_bytes,
|
||||
}
|
||||
|
||||
bool G1PrintRegionLivenessInfoClosure::doHeapRegion(HeapRegion* r) {
|
||||
const char* type = "";
|
||||
const char* type = r->get_type_str();
|
||||
HeapWord* bottom = r->bottom();
|
||||
HeapWord* end = r->end();
|
||||
size_t capacity_bytes = r->capacity();
|
||||
@ -4748,15 +4748,7 @@ bool G1PrintRegionLivenessInfoClosure::doHeapRegion(HeapRegion* r) {
|
||||
size_t remset_bytes = r->rem_set()->mem_size();
|
||||
size_t strong_code_roots_bytes = r->rem_set()->strong_code_roots_mem_size();
|
||||
|
||||
if (r->used() == 0) {
|
||||
type = "FREE";
|
||||
} else if (r->is_survivor()) {
|
||||
type = "SURV";
|
||||
} else if (r->is_young()) {
|
||||
type = "EDEN";
|
||||
} else if (r->startsHumongous()) {
|
||||
type = "HUMS";
|
||||
|
||||
if (r->startsHumongous()) {
|
||||
assert(_hum_used_bytes == 0 && _hum_capacity_bytes == 0 &&
|
||||
_hum_prev_live_bytes == 0 && _hum_next_live_bytes == 0,
|
||||
"they should have been zeroed after the last time we used them");
|
||||
@ -4769,12 +4761,9 @@ bool G1PrintRegionLivenessInfoClosure::doHeapRegion(HeapRegion* r) {
|
||||
&prev_live_bytes, &next_live_bytes);
|
||||
end = bottom + HeapRegion::GrainWords;
|
||||
} else if (r->continuesHumongous()) {
|
||||
type = "HUMC";
|
||||
get_hum_bytes(&used_bytes, &capacity_bytes,
|
||||
&prev_live_bytes, &next_live_bytes);
|
||||
assert(end == bottom + HeapRegion::GrainWords, "invariant");
|
||||
} else {
|
||||
type = "OLD";
|
||||
}
|
||||
|
||||
_total_used_bytes += used_bytes;
|
||||
|
||||
@ -211,7 +211,10 @@ void YoungList::empty_list(HeapRegion* list) {
|
||||
HeapRegion* next = list->get_next_young_region();
|
||||
list->set_next_young_region(NULL);
|
||||
list->uninstall_surv_rate_group();
|
||||
list->set_not_young();
|
||||
// This is called before a Full GC and all the non-empty /
|
||||
// non-humongous regions at the end of the Full GC will end up as
|
||||
// old anyway.
|
||||
list->set_old();
|
||||
list = next;
|
||||
}
|
||||
}
|
||||
@ -370,7 +373,7 @@ void YoungList::print() {
|
||||
if (curr == NULL)
|
||||
gclog_or_tty->print_cr(" empty");
|
||||
while (curr != NULL) {
|
||||
gclog_or_tty->print_cr(" "HR_FORMAT", P: "PTR_FORMAT "N: "PTR_FORMAT", age: %4d",
|
||||
gclog_or_tty->print_cr(" "HR_FORMAT", P: "PTR_FORMAT ", N: "PTR_FORMAT", age: %4d",
|
||||
HR_FORMAT_PARAMS(curr),
|
||||
curr->prev_top_at_mark_start(),
|
||||
curr->next_top_at_mark_start(),
|
||||
@ -802,6 +805,7 @@ HeapWord* G1CollectedHeap::humongous_obj_allocate(size_t word_size) {
|
||||
#ifdef ASSERT
|
||||
for (uint i = first; i < first + obj_regions; ++i) {
|
||||
HeapRegion* hr = region_at(i);
|
||||
assert(hr->is_free(), "sanity");
|
||||
assert(hr->is_empty(), "sanity");
|
||||
assert(is_on_master_free_list(hr), "sanity");
|
||||
}
|
||||
@ -1225,21 +1229,21 @@ private:
|
||||
public:
|
||||
bool doHeapRegion(HeapRegion* hr) {
|
||||
assert(!hr->is_young(), "not expecting to find young regions");
|
||||
// We only generate output for non-empty regions.
|
||||
if (!hr->is_empty()) {
|
||||
if (!hr->isHumongous()) {
|
||||
_hr_printer->post_compaction(hr, G1HRPrinter::Old);
|
||||
} else if (hr->startsHumongous()) {
|
||||
if (hr->region_num() == 1) {
|
||||
// single humongous region
|
||||
_hr_printer->post_compaction(hr, G1HRPrinter::SingleHumongous);
|
||||
} else {
|
||||
_hr_printer->post_compaction(hr, G1HRPrinter::StartsHumongous);
|
||||
}
|
||||
if (hr->is_free()) {
|
||||
// We only generate output for non-empty regions.
|
||||
} else if (hr->startsHumongous()) {
|
||||
if (hr->region_num() == 1) {
|
||||
// single humongous region
|
||||
_hr_printer->post_compaction(hr, G1HRPrinter::SingleHumongous);
|
||||
} else {
|
||||
assert(hr->continuesHumongous(), "only way to get here");
|
||||
_hr_printer->post_compaction(hr, G1HRPrinter::ContinuesHumongous);
|
||||
_hr_printer->post_compaction(hr, G1HRPrinter::StartsHumongous);
|
||||
}
|
||||
} else if (hr->continuesHumongous()) {
|
||||
_hr_printer->post_compaction(hr, G1HRPrinter::ContinuesHumongous);
|
||||
} else if (hr->is_old()) {
|
||||
_hr_printer->post_compaction(hr, G1HRPrinter::Old);
|
||||
} else {
|
||||
ShouldNotReachHere();
|
||||
}
|
||||
return false;
|
||||
}
|
||||
@ -1477,9 +1481,7 @@ bool G1CollectedHeap::do_collection(bool explicit_gc,
|
||||
|
||||
// Discard all rset updates
|
||||
JavaThread::dirty_card_queue_set().abandon_logs();
|
||||
assert(!G1DeferredRSUpdate
|
||||
|| (G1DeferredRSUpdate &&
|
||||
(dirty_card_queue_set().completed_buffers_num() == 0)), "Should not be any");
|
||||
assert(dirty_card_queue_set().completed_buffers_num() == 0, "DCQS should be empty");
|
||||
|
||||
_young_list->reset_sampled_info();
|
||||
// At this point there should be no regions in the
|
||||
@ -2090,15 +2092,13 @@ jint G1CollectedHeap::initialize() {
|
||||
concurrent_g1_refine()->red_zone(),
|
||||
Shared_DirtyCardQ_lock);
|
||||
|
||||
if (G1DeferredRSUpdate) {
|
||||
dirty_card_queue_set().initialize(NULL, // Should never be called by the Java code
|
||||
DirtyCardQ_CBL_mon,
|
||||
DirtyCardQ_FL_lock,
|
||||
-1, // never trigger processing
|
||||
-1, // no limit on length
|
||||
Shared_DirtyCardQ_lock,
|
||||
&JavaThread::dirty_card_queue_set());
|
||||
}
|
||||
dirty_card_queue_set().initialize(NULL, // Should never be called by the Java code
|
||||
DirtyCardQ_CBL_mon,
|
||||
DirtyCardQ_FL_lock,
|
||||
-1, // never trigger processing
|
||||
-1, // no limit on length
|
||||
Shared_DirtyCardQ_lock,
|
||||
&JavaThread::dirty_card_queue_set());
|
||||
|
||||
// Initialize the card queue set used to hold cards containing
|
||||
// references into the collection set.
|
||||
@ -2121,8 +2121,8 @@ jint G1CollectedHeap::initialize() {
|
||||
// We'll re-use the same region whether the alloc region will
|
||||
// require BOT updates or not and, if it doesn't, then a non-young
|
||||
// region will complain that it cannot support allocations without
|
||||
// BOT updates. So we'll tag the dummy region as young to avoid that.
|
||||
dummy_region->set_young();
|
||||
// BOT updates. So we'll tag the dummy region as eden to avoid that.
|
||||
dummy_region->set_eden();
|
||||
// Make sure it's full.
|
||||
dummy_region->set_top(dummy_region->end());
|
||||
G1AllocRegion::setup(this, dummy_region);
|
||||
@ -4031,14 +4031,6 @@ G1CollectedHeap::do_collection_pause_at_safepoint(double target_pause_time_ms) {
|
||||
if (_hr_printer.is_active()) {
|
||||
HeapRegion* hr = g1_policy()->collection_set();
|
||||
while (hr != NULL) {
|
||||
G1HRPrinter::RegionType type;
|
||||
if (!hr->is_young()) {
|
||||
type = G1HRPrinter::Old;
|
||||
} else if (hr->is_survivor()) {
|
||||
type = G1HRPrinter::Survivor;
|
||||
} else {
|
||||
type = G1HRPrinter::Eden;
|
||||
}
|
||||
_hr_printer.cset(hr);
|
||||
hr = hr->next_in_collection_set();
|
||||
}
|
||||
@ -5393,7 +5385,6 @@ class G1RedirtyLoggedCardsTask : public AbstractGangTask {
|
||||
};
|
||||
|
||||
void G1CollectedHeap::redirty_logged_cards() {
|
||||
guarantee(G1DeferredRSUpdate, "Must only be called when using deferred RS updates.");
|
||||
double redirty_logged_cards_start = os::elapsedTime();
|
||||
|
||||
uint n_workers = (G1CollectedHeap::use_parallel_gc_threads() ?
|
||||
@ -5448,9 +5439,10 @@ public:
|
||||
void do_oop(narrowOop* p) { guarantee(false, "Not needed"); }
|
||||
void do_oop(oop* p) {
|
||||
oop obj = *p;
|
||||
assert(obj != NULL, "the caller should have filtered out NULL values");
|
||||
|
||||
G1CollectedHeap::in_cset_state_t cset_state = _g1->in_cset_state(obj);
|
||||
if (obj == NULL || cset_state == G1CollectedHeap::InNeither) {
|
||||
if (cset_state == G1CollectedHeap::InNeither) {
|
||||
return;
|
||||
}
|
||||
if (cset_state == G1CollectedHeap::InCSet) {
|
||||
@ -6052,9 +6044,7 @@ void G1CollectedHeap::evacuate_collection_set(EvacuationInfo& evacuation_info) {
|
||||
// RSets.
|
||||
enqueue_discovered_references(n_workers);
|
||||
|
||||
if (G1DeferredRSUpdate) {
|
||||
redirty_logged_cards();
|
||||
}
|
||||
redirty_logged_cards();
|
||||
COMPILER2_PRESENT(DerivedPointerTable::update_pointers());
|
||||
}
|
||||
|
||||
@ -6062,7 +6052,7 @@ void G1CollectedHeap::free_region(HeapRegion* hr,
|
||||
FreeRegionList* free_list,
|
||||
bool par,
|
||||
bool locked) {
|
||||
assert(!hr->isHumongous(), "this is only for non-humongous regions");
|
||||
assert(!hr->is_free(), "the region should not be free");
|
||||
assert(!hr->is_empty(), "the region should not be empty");
|
||||
assert(_hrm.is_available(hr->hrm_index()), "region should be committed");
|
||||
assert(free_list != NULL, "pre-condition");
|
||||
@ -6092,14 +6082,14 @@ void G1CollectedHeap::free_humongous_region(HeapRegion* hr,
|
||||
// We need to read this before we make the region non-humongous,
|
||||
// otherwise the information will be gone.
|
||||
uint last_index = hr->last_hc_index();
|
||||
hr->set_notHumongous();
|
||||
hr->clear_humongous();
|
||||
free_region(hr, free_list, par);
|
||||
|
||||
uint i = hr->hrm_index() + 1;
|
||||
while (i < last_index) {
|
||||
HeapRegion* curr_hr = region_at(i);
|
||||
assert(curr_hr->continuesHumongous(), "invariant");
|
||||
curr_hr->set_notHumongous();
|
||||
curr_hr->clear_humongous();
|
||||
free_region(curr_hr, free_list, par);
|
||||
i += 1;
|
||||
}
|
||||
@ -6407,9 +6397,9 @@ void G1CollectedHeap::free_collection_set(HeapRegion* cs_head, EvacuationInfo& e
|
||||
if (cur->is_young()) {
|
||||
cur->set_young_index_in_cset(-1);
|
||||
}
|
||||
cur->set_not_young();
|
||||
cur->set_evacuation_failed(false);
|
||||
// The region is now considered to be old.
|
||||
cur->set_old();
|
||||
_old_set.add(cur);
|
||||
evacuation_info.increment_collectionset_used_after(cur->used());
|
||||
}
|
||||
@ -6696,16 +6686,15 @@ public:
|
||||
TearDownRegionSetsClosure(HeapRegionSet* old_set) : _old_set(old_set) { }
|
||||
|
||||
bool doHeapRegion(HeapRegion* r) {
|
||||
if (r->is_empty()) {
|
||||
// We ignore empty regions, we'll empty the free list afterwards
|
||||
} else if (r->is_young()) {
|
||||
// We ignore young regions, we'll empty the young list afterwards
|
||||
} else if (r->isHumongous()) {
|
||||
// We ignore humongous regions, we're not tearing down the
|
||||
// humongous region set
|
||||
} else {
|
||||
// The rest should be old
|
||||
if (r->is_old()) {
|
||||
_old_set->remove(r);
|
||||
} else {
|
||||
// We ignore free regions, we'll empty the free list afterwards.
|
||||
// We ignore young regions, we'll empty the young list afterwards.
|
||||
// We ignore humongous regions, we're not tearing down the
|
||||
// humongous regions set.
|
||||
assert(r->is_free() || r->is_young() || r->isHumongous(),
|
||||
"it cannot be another type");
|
||||
}
|
||||
return false;
|
||||
}
|
||||
@ -6755,6 +6744,7 @@ public:
|
||||
|
||||
if (r->is_empty()) {
|
||||
// Add free regions to the free list
|
||||
r->set_free();
|
||||
_hrm->insert_into_free_list(r);
|
||||
} else if (!_free_list_only) {
|
||||
assert(!r->is_young(), "we should not come across young regions");
|
||||
@ -6762,7 +6752,11 @@ public:
|
||||
if (r->isHumongous()) {
|
||||
// We ignore humongous regions, we left the humongous set unchanged
|
||||
} else {
|
||||
// The rest should be old, add them to the old set
|
||||
// Objects that were compacted would have ended up on regions
|
||||
// that were previously old or free.
|
||||
assert(r->is_free() || r->is_old(), "invariant");
|
||||
// We now consider them old, so register as such.
|
||||
r->set_old();
|
||||
_old_set->add(r);
|
||||
}
|
||||
_total_used += r->used();
|
||||
@ -6829,7 +6823,7 @@ HeapRegion* G1CollectedHeap::new_mutator_alloc_region(size_t word_size,
|
||||
void G1CollectedHeap::retire_mutator_alloc_region(HeapRegion* alloc_region,
|
||||
size_t allocated_bytes) {
|
||||
assert_heap_locked_or_at_safepoint(true /* should_be_vm_thread */);
|
||||
assert(alloc_region->is_young(), "all mutator alloc regions should be young");
|
||||
assert(alloc_region->is_eden(), "all mutator alloc regions should be eden");
|
||||
|
||||
g1_policy()->add_region_to_incremental_cset_lhs(alloc_region);
|
||||
_summary_bytes_used += allocated_bytes;
|
||||
@ -6888,6 +6882,7 @@ HeapRegion* G1CollectedHeap::new_gc_alloc_region(size_t word_size,
|
||||
_hr_printer.alloc(new_alloc_region, G1HRPrinter::Survivor);
|
||||
check_bitmaps("Survivor Region Allocation", new_alloc_region);
|
||||
} else {
|
||||
new_alloc_region->set_old();
|
||||
_hr_printer.alloc(new_alloc_region, G1HRPrinter::Old);
|
||||
check_bitmaps("Old Region Allocation", new_alloc_region);
|
||||
}
|
||||
@ -6999,9 +6994,11 @@ public:
|
||||
} else if (hr->is_empty()) {
|
||||
assert(_hrm->is_free(hr), err_msg("Heap region %u is empty but not on the free list.", hr->hrm_index()));
|
||||
_free_count.increment(1u, hr->capacity());
|
||||
} else {
|
||||
} else if (hr->is_old()) {
|
||||
assert(hr->containing_set() == _old_set, err_msg("Heap region %u is old but not in the old set.", hr->hrm_index()));
|
||||
_old_count.increment(1u, hr->capacity());
|
||||
} else {
|
||||
ShouldNotReachHere();
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
@ -1665,7 +1665,7 @@ G1CollectorPolicy::record_concurrent_mark_cleanup_end(int no_of_gc_threads) {
|
||||
// Add the heap region at the head of the non-incremental collection set
|
||||
void G1CollectorPolicy::add_old_region_to_cset(HeapRegion* hr) {
|
||||
assert(_inc_cset_build_state == Active, "Precondition");
|
||||
assert(!hr->is_young(), "non-incremental add of young region");
|
||||
assert(hr->is_old(), "the region should be old");
|
||||
|
||||
assert(!hr->in_collection_set(), "should not already be in the CSet");
|
||||
hr->set_in_collection_set(true);
|
||||
@ -1811,7 +1811,7 @@ void G1CollectorPolicy::add_region_to_incremental_cset_common(HeapRegion* hr) {
|
||||
// Add the region at the RHS of the incremental cset
|
||||
void G1CollectorPolicy::add_region_to_incremental_cset_rhs(HeapRegion* hr) {
|
||||
// We should only ever be appending survivors at the end of a pause
|
||||
assert( hr->is_survivor(), "Logic");
|
||||
assert(hr->is_survivor(), "Logic");
|
||||
|
||||
// Do the 'common' stuff
|
||||
add_region_to_incremental_cset_common(hr);
|
||||
@ -1829,7 +1829,7 @@ void G1CollectorPolicy::add_region_to_incremental_cset_rhs(HeapRegion* hr) {
|
||||
// Add the region to the LHS of the incremental cset
|
||||
void G1CollectorPolicy::add_region_to_incremental_cset_lhs(HeapRegion* hr) {
|
||||
// Survivors should be added to the RHS at the end of a pause
|
||||
assert(!hr->is_survivor(), "Logic");
|
||||
assert(hr->is_eden(), "Logic");
|
||||
|
||||
// Do the 'common' stuff
|
||||
add_region_to_incremental_cset_common(hr);
|
||||
@ -1989,7 +1989,11 @@ void G1CollectorPolicy::finalize_cset(double target_pause_time_ms, EvacuationInf
|
||||
HeapRegion* hr = young_list->first_survivor_region();
|
||||
while (hr != NULL) {
|
||||
assert(hr->is_survivor(), "badly formed young list");
|
||||
hr->set_young();
|
||||
// There is a convention that all the young regions in the CSet
|
||||
// are tagged as "eden", so we do this for the survivors here. We
|
||||
// use the special set_eden_pre_gc() as it doesn't check that the
|
||||
// region is free (which is not the case here).
|
||||
hr->set_eden_pre_gc();
|
||||
hr = hr->get_next_young_region();
|
||||
}
|
||||
|
||||
|
||||
@ -299,13 +299,13 @@ public:
|
||||
// Accessors
|
||||
|
||||
void set_region_eden(HeapRegion* hr, int young_index_in_cset) {
|
||||
hr->set_young();
|
||||
hr->set_eden();
|
||||
hr->install_surv_rate_group(_short_lived_surv_rate_group);
|
||||
hr->set_young_index_in_cset(young_index_in_cset);
|
||||
}
|
||||
|
||||
void set_region_survivor(HeapRegion* hr, int young_index_in_cset) {
|
||||
assert(hr->is_young() && hr->is_survivor(), "pre-condition");
|
||||
assert(hr->is_survivor(), "pre-condition");
|
||||
hr->install_surv_rate_group(_survivor_surv_rate_group);
|
||||
hr->set_young_index_in_cset(young_index_in_cset);
|
||||
}
|
||||
|
||||
@ -176,15 +176,17 @@ public:
|
||||
class RemoveSelfForwardPtrHRClosure: public HeapRegionClosure {
|
||||
G1CollectedHeap* _g1h;
|
||||
ConcurrentMark* _cm;
|
||||
OopsInHeapRegionClosure *_update_rset_cl;
|
||||
uint _worker_id;
|
||||
|
||||
DirtyCardQueue _dcq;
|
||||
UpdateRSetDeferred _update_rset_cl;
|
||||
|
||||
public:
|
||||
RemoveSelfForwardPtrHRClosure(G1CollectedHeap* g1h,
|
||||
OopsInHeapRegionClosure* update_rset_cl,
|
||||
uint worker_id) :
|
||||
_g1h(g1h), _update_rset_cl(update_rset_cl),
|
||||
_worker_id(worker_id), _cm(_g1h->concurrent_mark()) { }
|
||||
_g1h(g1h), _dcq(&g1h->dirty_card_queue_set()), _update_rset_cl(g1h, &_dcq),
|
||||
_worker_id(worker_id), _cm(_g1h->concurrent_mark()) {
|
||||
}
|
||||
|
||||
bool doHeapRegion(HeapRegion *hr) {
|
||||
bool during_initial_mark = _g1h->g1_policy()->during_initial_mark_pause();
|
||||
@ -195,7 +197,7 @@ public:
|
||||
|
||||
if (hr->claimHeapRegion(HeapRegion::ParEvacFailureClaimValue)) {
|
||||
if (hr->evacuation_failed()) {
|
||||
RemoveSelfForwardPtrObjClosure rspc(_g1h, _cm, hr, _update_rset_cl,
|
||||
RemoveSelfForwardPtrObjClosure rspc(_g1h, _cm, hr, &_update_rset_cl,
|
||||
during_initial_mark,
|
||||
during_conc_mark,
|
||||
_worker_id);
|
||||
@ -214,7 +216,7 @@ public:
|
||||
// whenever this might be required in the future.
|
||||
hr->rem_set()->reset_for_par_iteration();
|
||||
hr->reset_bot();
|
||||
_update_rset_cl->set_region(hr);
|
||||
_update_rset_cl.set_region(hr);
|
||||
hr->object_iterate(&rspc);
|
||||
|
||||
hr->rem_set()->clean_strong_code_roots(hr);
|
||||
@ -238,16 +240,7 @@ public:
|
||||
_g1h(g1h) { }
|
||||
|
||||
void work(uint worker_id) {
|
||||
UpdateRSetImmediate immediate_update(_g1h->g1_rem_set());
|
||||
DirtyCardQueue dcq(&_g1h->dirty_card_queue_set());
|
||||
UpdateRSetDeferred deferred_update(_g1h, &dcq);
|
||||
|
||||
OopsInHeapRegionClosure *update_rset_cl = &deferred_update;
|
||||
if (!G1DeferredRSUpdate) {
|
||||
update_rset_cl = &immediate_update;
|
||||
}
|
||||
|
||||
RemoveSelfForwardPtrHRClosure rsfp_cl(_g1h, update_rset_cl, worker_id);
|
||||
RemoveSelfForwardPtrHRClosure rsfp_cl(_g1h, worker_id);
|
||||
|
||||
HeapRegion* hr = _g1h->start_cset_region_for_worker(worker_id);
|
||||
_g1h->collection_set_iterate_from(hr, &rsfp_cl);
|
||||
|
||||
@ -237,10 +237,8 @@ void G1GCPhaseTimes::note_gc_end() {
|
||||
_last_gc_worker_times_ms.verify();
|
||||
_last_gc_worker_other_times_ms.verify();
|
||||
|
||||
if (G1DeferredRSUpdate) {
|
||||
_last_redirty_logged_cards_time_ms.verify();
|
||||
_last_redirty_logged_cards_processed_cards.verify();
|
||||
}
|
||||
_last_redirty_logged_cards_time_ms.verify();
|
||||
_last_redirty_logged_cards_processed_cards.verify();
|
||||
}
|
||||
|
||||
void G1GCPhaseTimes::note_string_dedup_fixup_start() {
|
||||
@ -352,12 +350,10 @@ void G1GCPhaseTimes::print(double pause_time_sec) {
|
||||
_recorded_non_young_cset_choice_time_ms));
|
||||
print_stats(2, "Ref Proc", _cur_ref_proc_time_ms);
|
||||
print_stats(2, "Ref Enq", _cur_ref_enq_time_ms);
|
||||
if (G1DeferredRSUpdate) {
|
||||
print_stats(2, "Redirty Cards", _recorded_redirty_logged_cards_time_ms);
|
||||
if (G1Log::finest()) {
|
||||
_last_redirty_logged_cards_time_ms.print(3, "Parallel Redirty");
|
||||
_last_redirty_logged_cards_processed_cards.print(3, "Redirtied Cards");
|
||||
}
|
||||
print_stats(2, "Redirty Cards", _recorded_redirty_logged_cards_time_ms);
|
||||
if (G1Log::finest()) {
|
||||
_last_redirty_logged_cards_time_ms.print(3, "Parallel Redirty");
|
||||
_last_redirty_logged_cards_processed_cards.print(3, "Redirtied Cards");
|
||||
}
|
||||
if (G1ReclaimDeadHumongousObjectsAtYoungGC) {
|
||||
print_stats(2, "Humongous Reclaim", _cur_fast_reclaim_humongous_time_ms);
|
||||
|
||||
@ -27,7 +27,6 @@
|
||||
#include "gc_implementation/g1/g1CollectedHeap.inline.hpp"
|
||||
#include "gc_implementation/g1/g1HotCardCache.hpp"
|
||||
#include "gc_implementation/g1/g1RemSet.hpp"
|
||||
#include "gc_implementation/g1/heapRegion.hpp"
|
||||
#include "runtime/atomic.inline.hpp"
|
||||
|
||||
G1HotCardCache::G1HotCardCache(G1CollectedHeap *g1h):
|
||||
@ -136,7 +135,6 @@ void G1HotCardCache::drain(uint worker_i,
|
||||
}
|
||||
|
||||
void G1HotCardCache::reset_card_counts(HeapRegion* hr) {
|
||||
assert(!hr->isHumongous(), "Should have been cleared");
|
||||
_card_counts.clear_region(hr);
|
||||
}
|
||||
|
||||
|
||||
@ -84,20 +84,6 @@ class G1ParScanThreadState : public StackObj {
|
||||
DirtyCardQueue& dirty_card_queue() { return _dcq; }
|
||||
G1SATBCardTableModRefBS* ctbs() { return _ct_bs; }
|
||||
|
||||
template <class T> inline void immediate_rs_update(HeapRegion* from, T* p, int tid);
|
||||
|
||||
template <class T> void deferred_rs_update(HeapRegion* from, T* p, int tid) {
|
||||
// If the new value of the field points to the same region or
|
||||
// is the to-space, we don't need to include it in the Rset updates.
|
||||
if (!from->is_in_reserved(oopDesc::load_decode_heap_oop(p)) && !from->is_survivor()) {
|
||||
size_t card_index = ctbs()->index_for(p);
|
||||
// If the card hasn't been added to the buffer, do it.
|
||||
if (ctbs()->mark_card_deferred(card_index)) {
|
||||
dirty_card_queue().enqueue((jbyte*)ctbs()->byte_for_index(card_index));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public:
|
||||
G1ParScanThreadState(G1CollectedHeap* g1h, uint queue_num, ReferenceProcessor* rp);
|
||||
~G1ParScanThreadState();
|
||||
@ -124,8 +110,17 @@ class G1ParScanThreadState : public StackObj {
|
||||
_refs->push(ref);
|
||||
}
|
||||
|
||||
template <class T> inline void update_rs(HeapRegion* from, T* p, int tid);
|
||||
|
||||
template <class T> void update_rs(HeapRegion* from, T* p, int tid) {
|
||||
// If the new value of the field points to the same region or
|
||||
// is the to-space, we don't need to include it in the Rset updates.
|
||||
if (!from->is_in_reserved(oopDesc::load_decode_heap_oop(p)) && !from->is_survivor()) {
|
||||
size_t card_index = ctbs()->index_for(p);
|
||||
// If the card hasn't been added to the buffer, do it.
|
||||
if (ctbs()->mark_card_deferred(card_index)) {
|
||||
dirty_card_queue().enqueue((jbyte*)ctbs()->byte_for_index(card_index));
|
||||
}
|
||||
}
|
||||
}
|
||||
private:
|
||||
|
||||
inline HeapWord* allocate(GCAllocPurpose purpose, size_t word_sz);
|
||||
|
||||
@ -29,20 +29,6 @@
|
||||
#include "gc_implementation/g1/g1RemSet.inline.hpp"
|
||||
#include "oops/oop.inline.hpp"
|
||||
|
||||
template <class T> inline void G1ParScanThreadState::immediate_rs_update(HeapRegion* from, T* p, int tid) {
|
||||
if (!from->is_survivor()) {
|
||||
_g1_rem->par_write_ref(from, p, tid);
|
||||
}
|
||||
}
|
||||
|
||||
template <class T> void G1ParScanThreadState::update_rs(HeapRegion* from, T* p, int tid) {
|
||||
if (G1DeferredRSUpdate) {
|
||||
deferred_rs_update(from, p, tid);
|
||||
} else {
|
||||
immediate_rs_update(from, p, tid);
|
||||
}
|
||||
}
|
||||
|
||||
template <class T> void G1ParScanThreadState::do_oop_evac(T* p, HeapRegion* from) {
|
||||
assert(!oopDesc::is_null(oopDesc::load_decode_heap_oop(p)),
|
||||
"Reference should not be NULL here as such are never pushed to the task queue.");
|
||||
|
||||
@ -339,12 +339,8 @@ void G1RemSet::oops_into_collection_set_do(OopsInHeapRegionClosure* oc,
|
||||
// are just discarded (there's no need to update the RSets of regions
|
||||
// that were in the collection set - after the pause these regions
|
||||
// are wholly 'free' of live objects. In the event of an evacuation
|
||||
// failure the cards/buffers in this queue set are:
|
||||
// * passed to the DirtyCardQueueSet that is used to manage deferred
|
||||
// RSet updates, or
|
||||
// * scanned for references that point into the collection set
|
||||
// and the RSet of the corresponding region in the collection set
|
||||
// is updated immediately.
|
||||
// failure the cards/buffers in this queue set are passed to the
|
||||
// DirtyCardQueueSet that is used to manage RSet updates
|
||||
DirtyCardQueue into_cset_dcq(&_g1->into_cset_dirty_card_queue_set());
|
||||
|
||||
assert((ParallelGCThreads > 0) || worker_i == 0, "invariant");
|
||||
@ -358,7 +354,6 @@ void G1RemSet::oops_into_collection_set_do(OopsInHeapRegionClosure* oc,
|
||||
|
||||
void G1RemSet::prepare_for_oops_into_collection_set_do() {
|
||||
cleanupHRRS();
|
||||
ConcurrentG1Refine* cg1r = _g1->concurrent_g1_refine();
|
||||
_g1->set_refine_cte_cl_concurrency(false);
|
||||
DirtyCardQueueSet& dcqs = JavaThread::dirty_card_queue_set();
|
||||
dcqs.concatenate_logs();
|
||||
@ -371,66 +366,6 @@ void G1RemSet::prepare_for_oops_into_collection_set_do() {
|
||||
_total_cards_scanned = 0;
|
||||
}
|
||||
|
||||
|
||||
// This closure, applied to a DirtyCardQueueSet, is used to immediately
|
||||
// update the RSets for the regions in the CSet. For each card it iterates
|
||||
// through the oops which coincide with that card. It scans the reference
|
||||
// fields in each oop; when it finds an oop that points into the collection
|
||||
// set, the RSet for the region containing the referenced object is updated.
|
||||
class UpdateRSetCardTableEntryIntoCSetClosure: public CardTableEntryClosure {
|
||||
G1CollectedHeap* _g1;
|
||||
CardTableModRefBS* _ct_bs;
|
||||
public:
|
||||
UpdateRSetCardTableEntryIntoCSetClosure(G1CollectedHeap* g1,
|
||||
CardTableModRefBS* bs):
|
||||
_g1(g1), _ct_bs(bs)
|
||||
{ }
|
||||
|
||||
bool do_card_ptr(jbyte* card_ptr, uint worker_i) {
|
||||
// Construct the region representing the card.
|
||||
HeapWord* start = _ct_bs->addr_for(card_ptr);
|
||||
// And find the region containing it.
|
||||
HeapRegion* r = _g1->heap_region_containing(start);
|
||||
|
||||
// Scan oops in the card looking for references into the collection set
|
||||
// Don't use addr_for(card_ptr + 1) which can ask for
|
||||
// a card beyond the heap. This is not safe without a perm
|
||||
// gen.
|
||||
HeapWord* end = start + CardTableModRefBS::card_size_in_words;
|
||||
MemRegion scanRegion(start, end);
|
||||
|
||||
UpdateRSetImmediate update_rs_cl(_g1->g1_rem_set());
|
||||
FilterIntoCSClosure update_rs_cset_oop_cl(NULL, _g1, &update_rs_cl);
|
||||
FilterOutOfRegionClosure filter_then_update_rs_cset_oop_cl(r, &update_rs_cset_oop_cl);
|
||||
|
||||
// We can pass false as the "filter_young" parameter here as:
|
||||
// * we should be in a STW pause,
|
||||
// * the DCQS to which this closure is applied is used to hold
|
||||
// references that point into the collection set from the prior
|
||||
// RSet updating,
|
||||
// * the post-write barrier shouldn't be logging updates to young
|
||||
// regions (but there is a situation where this can happen - see
|
||||
// the comment in G1RemSet::refine_card() below -
|
||||
// that should not be applicable here), and
|
||||
// * during actual RSet updating, the filtering of cards in young
|
||||
// regions in HeapRegion::oops_on_card_seq_iterate_careful is
|
||||
// employed.
|
||||
// As a result, when this closure is applied to "refs into cset"
|
||||
// DCQS, we shouldn't see any cards in young regions.
|
||||
update_rs_cl.set_region(r);
|
||||
HeapWord* stop_point =
|
||||
r->oops_on_card_seq_iterate_careful(scanRegion,
|
||||
&filter_then_update_rs_cset_oop_cl,
|
||||
false /* filter_young */,
|
||||
NULL /* card_ptr */);
|
||||
|
||||
// Since this is performed in the event of an evacuation failure, we
|
||||
// we shouldn't see a non-null stop point
|
||||
assert(stop_point == NULL, "saw an unallocated region");
|
||||
return true;
|
||||
}
|
||||
};
|
||||
|
||||
void G1RemSet::cleanup_after_oops_into_collection_set_do() {
|
||||
guarantee( _cards_scanned != NULL, "invariant" );
|
||||
_total_cards_scanned = 0;
|
||||
@ -451,25 +386,10 @@ void G1RemSet::cleanup_after_oops_into_collection_set_do() {
|
||||
double restore_remembered_set_start = os::elapsedTime();
|
||||
|
||||
// Restore remembered sets for the regions pointing into the collection set.
|
||||
if (G1DeferredRSUpdate) {
|
||||
// If deferred RS updates are enabled then we just need to transfer
|
||||
// the completed buffers from (a) the DirtyCardQueueSet used to hold
|
||||
// cards that contain references that point into the collection set
|
||||
// to (b) the DCQS used to hold the deferred RS updates
|
||||
_g1->dirty_card_queue_set().merge_bufferlists(&into_cset_dcqs);
|
||||
} else {
|
||||
|
||||
CardTableModRefBS* bs = (CardTableModRefBS*)_g1->barrier_set();
|
||||
UpdateRSetCardTableEntryIntoCSetClosure update_rs_cset_immediate(_g1, bs);
|
||||
|
||||
int n_completed_buffers = 0;
|
||||
while (into_cset_dcqs.apply_closure_to_completed_buffer(&update_rs_cset_immediate,
|
||||
0, 0, true)) {
|
||||
n_completed_buffers++;
|
||||
}
|
||||
assert(n_completed_buffers == into_cset_n_buffers, "missed some buffers");
|
||||
}
|
||||
|
||||
// We just need to transfer the completed buffers from the DirtyCardQueueSet
|
||||
// used to hold cards that contain references that point into the collection set
|
||||
// to the DCQS used to hold the deferred RS updates.
|
||||
_g1->dirty_card_queue_set().merge_bufferlists(&into_cset_dcqs);
|
||||
_g1->g1_policy()->phase_times()->record_evac_fail_restore_remsets((os::elapsedTime() - restore_remembered_set_start) * 1000.0);
|
||||
}
|
||||
|
||||
|
||||
@ -193,18 +193,4 @@ public:
|
||||
bool apply_to_weak_ref_discovered_field() { return true; }
|
||||
};
|
||||
|
||||
class UpdateRSetImmediate: public OopsInHeapRegionClosure {
|
||||
private:
|
||||
G1RemSet* _g1_rem_set;
|
||||
|
||||
template <class T> void do_oop_work(T* p);
|
||||
public:
|
||||
UpdateRSetImmediate(G1RemSet* rs) :
|
||||
_g1_rem_set(rs) {}
|
||||
|
||||
virtual void do_oop(narrowOop* p) { do_oop_work(p); }
|
||||
virtual void do_oop( oop* p) { do_oop_work(p); }
|
||||
};
|
||||
|
||||
|
||||
#endif // SHARE_VM_GC_IMPLEMENTATION_G1_G1REMSET_HPP
|
||||
|
||||
@ -79,13 +79,4 @@ inline void UpdateRSOopClosure::do_oop_work(T* p) {
|
||||
_rs->par_write_ref(_from, p, _worker_i);
|
||||
}
|
||||
|
||||
template <class T>
|
||||
inline void UpdateRSetImmediate::do_oop_work(T* p) {
|
||||
assert(_from->is_in_reserved(p), "paranoia");
|
||||
T heap_oop = oopDesc::load_heap_oop(p);
|
||||
if (!oopDesc::is_null(heap_oop) && !_from->is_survivor()) {
|
||||
_g1_rem_set->par_write_ref(_from, p, 0);
|
||||
}
|
||||
}
|
||||
|
||||
#endif // SHARE_VM_GC_IMPLEMENTATION_G1_G1REMSET_INLINE_HPP
|
||||
|
||||
@ -259,14 +259,16 @@ public:
|
||||
size_t code_root_elems = hrrs->strong_code_roots_list_length();
|
||||
|
||||
RegionTypeCounter* current = NULL;
|
||||
if (r->is_young()) {
|
||||
if (r->is_free()) {
|
||||
current = &_free;
|
||||
} else if (r->is_young()) {
|
||||
current = &_young;
|
||||
} else if (r->isHumongous()) {
|
||||
current = &_humonguous;
|
||||
} else if (r->is_empty()) {
|
||||
current = &_free;
|
||||
} else {
|
||||
} else if (r->is_old()) {
|
||||
current = &_old;
|
||||
} else {
|
||||
ShouldNotReachHere();
|
||||
}
|
||||
current->add(rs_mem_sz, occupied_cards, code_root_mem_sz, code_root_elems);
|
||||
_all.add(rs_mem_sz, occupied_cards, code_root_mem_sz, code_root_elems);
|
||||
|
||||
@ -31,8 +31,6 @@
|
||||
#include "oops/oop.inline.hpp"
|
||||
#include "utilities/macros.hpp"
|
||||
|
||||
#if INCLUDE_ALL_GCS
|
||||
|
||||
class DirtyCardQueueSet;
|
||||
class G1SATBCardTableLoggingModRefBS;
|
||||
|
||||
@ -180,7 +178,4 @@ class G1SATBCardTableLoggingModRefBS: public G1SATBCardTableModRefBS {
|
||||
void write_ref_array_work(MemRegion mr) { invalidate(mr); }
|
||||
};
|
||||
|
||||
|
||||
#endif // INCLUDE_ALL_GCS
|
||||
|
||||
#endif // SHARE_VM_GC_IMPLEMENTATION_G1_G1SATBCARDTABLEMODREFBS_HPP
|
||||
|
||||
@ -108,9 +108,6 @@
|
||||
develop(bool, G1RSBarrierRegionFilter, true, \
|
||||
"If true, generate region filtering code in RS barrier") \
|
||||
\
|
||||
develop(bool, G1DeferredRSUpdate, true, \
|
||||
"If true, use deferred RS updates") \
|
||||
\
|
||||
develop(bool, G1RSLogCheckCardTable, false, \
|
||||
"If true, verify that no dirty cards remain after RS log " \
|
||||
"processing.") \
|
||||
|
||||
@ -211,8 +211,6 @@ void HeapRegion::reset_after_compaction() {
|
||||
}
|
||||
|
||||
void HeapRegion::hr_clear(bool par, bool clear_space, bool locked) {
|
||||
assert(_humongous_type == NotHumongous,
|
||||
"we should have already filtered out humongous regions");
|
||||
assert(_humongous_start_region == NULL,
|
||||
"we should have already filtered out humongous regions");
|
||||
assert(_end == _orig_end,
|
||||
@ -222,7 +220,7 @@ void HeapRegion::hr_clear(bool par, bool clear_space, bool locked) {
|
||||
|
||||
set_young_index_in_cset(-1);
|
||||
uninstall_surv_rate_group();
|
||||
set_young_type(NotYoung);
|
||||
set_free();
|
||||
reset_pre_dummy_top();
|
||||
|
||||
if (!par) {
|
||||
@ -273,7 +271,7 @@ void HeapRegion::set_startsHumongous(HeapWord* new_top, HeapWord* new_end) {
|
||||
assert(top() == bottom(), "should be empty");
|
||||
assert(bottom() <= new_top && new_top <= new_end, "pre-condition");
|
||||
|
||||
_humongous_type = StartsHumongous;
|
||||
_type.set_starts_humongous();
|
||||
_humongous_start_region = this;
|
||||
|
||||
set_end(new_end);
|
||||
@ -287,11 +285,11 @@ void HeapRegion::set_continuesHumongous(HeapRegion* first_hr) {
|
||||
assert(top() == bottom(), "should be empty");
|
||||
assert(first_hr->startsHumongous(), "pre-condition");
|
||||
|
||||
_humongous_type = ContinuesHumongous;
|
||||
_type.set_continues_humongous();
|
||||
_humongous_start_region = first_hr;
|
||||
}
|
||||
|
||||
void HeapRegion::set_notHumongous() {
|
||||
void HeapRegion::clear_humongous() {
|
||||
assert(isHumongous(), "pre-condition");
|
||||
|
||||
if (startsHumongous()) {
|
||||
@ -307,7 +305,6 @@ void HeapRegion::set_notHumongous() {
|
||||
}
|
||||
|
||||
assert(capacity() == HeapRegion::GrainBytes, "pre-condition");
|
||||
_humongous_type = NotHumongous;
|
||||
_humongous_start_region = NULL;
|
||||
}
|
||||
|
||||
@ -327,12 +324,12 @@ HeapRegion::HeapRegion(uint hrm_index,
|
||||
MemRegion mr) :
|
||||
G1OffsetTableContigSpace(sharedOffsetArray, mr),
|
||||
_hrm_index(hrm_index),
|
||||
_humongous_type(NotHumongous), _humongous_start_region(NULL),
|
||||
_humongous_start_region(NULL),
|
||||
_in_collection_set(false),
|
||||
_next_in_special_set(NULL), _orig_end(NULL),
|
||||
_claimed(InitialClaimValue), _evacuation_failed(false),
|
||||
_prev_marked_bytes(0), _next_marked_bytes(0), _gc_efficiency(0.0),
|
||||
_young_type(NotYoung), _next_young_region(NULL),
|
||||
_next_young_region(NULL),
|
||||
_next_dirty_cards_region(NULL), _next(NULL), _prev(NULL),
|
||||
#ifdef ASSERT
|
||||
_containing_set(NULL),
|
||||
@ -686,26 +683,11 @@ void HeapRegion::verify_strong_code_roots(VerifyOption vo, bool* failures) const
|
||||
|
||||
void HeapRegion::print() const { print_on(gclog_or_tty); }
|
||||
void HeapRegion::print_on(outputStream* st) const {
|
||||
if (isHumongous()) {
|
||||
if (startsHumongous())
|
||||
st->print(" HS");
|
||||
else
|
||||
st->print(" HC");
|
||||
} else {
|
||||
st->print(" ");
|
||||
}
|
||||
st->print(" %2s", get_short_type_str());
|
||||
if (in_collection_set())
|
||||
st->print(" CS");
|
||||
else
|
||||
st->print(" ");
|
||||
if (is_young())
|
||||
st->print(is_survivor() ? " SU" : " Y ");
|
||||
else
|
||||
st->print(" ");
|
||||
if (is_empty())
|
||||
st->print(" F");
|
||||
else
|
||||
st->print(" ");
|
||||
st->print(" TS %5d", _gc_time_stamp);
|
||||
st->print(" PTAMS "PTR_FORMAT" NTAMS "PTR_FORMAT,
|
||||
prev_top_at_mark_start(), next_top_at_mark_start());
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user