Attachment #98935 for bug #148629

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

View | Details | Raw Unified | Return to bug 148629 | Differences between

and this patch

Collapse All | Expand All

Lines 27-32 Link Here

(-)src-native/src/Martini/Infrastructure/JIE/JIEImpl.h (+4 lines)
27	// IJIE methods	27	// IJIE methods
28	virtual IJavaClass GetClassInterface(const unsigned char pucClassFile,	28	virtual IJavaClass GetClassInterface(const unsigned char pucClassFile,
29	unsigned int uiClassSize) const;	29	unsigned int uiClassSize) const;
		30	virtual void EnableStackMapCalculation() const;
		31
		32	private:
		33	TResult BindJpiFunctions() const;
30		34
31	}; // class CJIE	35	}; // class CJIE
32		36





#include <assert.h>

#include "MRTEInfrastructureDefinitions.h"
#include "JIEInstructionCodec.h"
#include "JClassFile.h"
#include "MRTEInfrastructureDefinitions.h"
#include "ValidityChecks.h"
#include "MIEInstructionFactory.h"

#include "JClassFile.h"

using namespace Martini::MIE;
using namespace Martini::Infrastructure;




# PROP Target_Dir ""
F90=df.exe
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /I "..\Include" /I "..\..\Include" /I "..\..\..\Include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "JIE_EXPORTS" /FD /c
# ADD CPP /nologo /MT /W3 /GX /Zi /O2 /I "..\Include" /I "..\..\Include" /I "..\..\..\..\include\Martini" /I "..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\BCI\Common" /I "..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\BCI\BCIEng" /I "..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\BCI\BCIEng\BCIEngJ" /I "..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\BCI\JClass" /I "..\..\..\..\..\..\org.apache.harmony_vmcore_verifier\src\include" /I "..\..\..\..\..\..\org.apache.harmony_vmcore_verifier\src\vmcore\include" /I "..\..\..\..\..\..\org.apache.harmony_vmcore_verifier\src\vmcore\src\verifier-3363\x_verifier" /I "$(JAVA_HOME)\include" /I "$(JAVA_HOME)\include\win32" /D "NDEBUG" /D "IA32_ARCH" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "JIE_EXPORTS" /D "MARTINI_JIE" /D "STATIC_BUILD" /FD /c
# SUBTRACT CPP /Fr
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32

# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib /nologo /dll /machine:I386
# ADD LINK32 kernel32.lib MartiniOSA.lib verifier.lib /nologo /dll /debug /machine:I386 /libpath:"..\..\..\..\bin\windows\release\IA-32" /libpath:"..\..\..\..\..\..\org.apache.harmony_vmcore_verifier\lib\windows\release\IA-32"
# SUBTRACT LINK32 /incremental:yes

!ELSEIF  "$(CFG)" == "JIE - Win32 IA32 Debug"

# PROP Target_Dir ""
F90=df.exe
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\Include" /I "..\..\Include" /I "..\..\..\Include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "JIE_EXPORTS" /FR /FD /GZ /c
# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\Include" /I "..\..\Include" /I "..\..\..\..\include\Martini" /I "..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\BCI\Common" /I "..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\BCI\BCIEng" /I "..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\BCI\BCIEng\BCIEngJ" /I "..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\BCI\JClass" /I "..\..\..\..\..\..\org.apache.harmony_vmcore_verifier\src\include" /I "..\..\..\..\..\..\org.apache.harmony_vmcore_verifier\src\vmcore\include" /I "..\..\..\..\..\..\org.apache.harmony_vmcore_verifier\src\vmcore\src\verifier-3363\x_verifier" /I "$(JAVA_HOME)\include" /I "$(JAVA_HOME)\include\win32" /D "_DEBUG" /D "IA32_ARCH" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "JIE_EXPORTS" /D "MARTINI_JIE" /D "STATIC_BUILD" /FR /FD /GZ /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"

# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
# ADD LINK32 kernel32.lib MartiniOSA.lib verifier.lib /nologo /dll /map /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\bin\windows\debug\IA-32" /libpath:"..\..\..\..\..\..\org.apache.harmony_vmcore_verifier\lib\windows\debug\IA-32"
# SUBTRACT LINK32 /incremental:no

!ELSEIF  "$(CFG)" == "JIE - Win32 EM64T Debug"

# PROP Target_Dir ""
F90=df.exe
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\Include" /I "..\..\Include" /I "..\..\..\Include" /I "..\Include\win" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "JIE_EXPORTS" /FR /FD /GZ /c
# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\Include" /I "..\..\Include" /I "..\..\..\..\include\Martini" /I "..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\BCI\Common" /I "..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\BCI\BCIEng" /I "..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\BCI\BCIEng\BCIEngJ" /I "..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\BCI\JClass" /D "_DEBUG" /D "EM64T_ARCH" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "JIE_EXPORTS" /D "MARTINI_JIE" /D "VERIFIER_STANDALONE" /FD /GZ /c
# SUBTRACT CPP /Fr
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32

# PROP Target_Dir ""
F90=df.exe
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /I "..\Include" /I "..\..\Include" /I "..\..\..\Include" /I "..\Include\win" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "JIE_EXPORTS" /FD /c
# ADD CPP /nologo /MT /W3 /GX /Zi /O2 /I "..\Include" /I "..\..\Include" /I "..\..\..\..\include\Martini" /I "..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\BCI\Common" /I "..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\BCI\BCIEng" /I "..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\BCI\BCIEng\BCIEngJ" /I "..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\BCI\JClass" /D "NDEBUG" /D "EM64T_ARCH" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "JIE_EXPORTS" /D "MARTINI_JIE" /D "VERIFIER_STANDALONE" /FD /c
# SUBTRACT CPP /Fr
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32

# PROP Target_Dir ""
F90=df.exe
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /I "..\Include" /I "..\..\Include" /I "..\..\..\Include" /I "..\Include\win" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "JIE_EXPORTS" /FD /c
# ADD CPP /nologo /MT /W3 /GX /Zi /O2 /I "..\Include" /I "..\..\Include" /I "..\..\..\..\include\Martini" /I "..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\BCI\Common" /I "..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\BCI\BCIEng" /I "..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\BCI\BCIEng\BCIEngJ" /I "..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\BCI\JClass" /D "NDEBUG" /D "IPF_ARCH" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "JIE_EXPORTS" /D "MARTINI_JIE" /D "VERIFIER_STANDALONE" /FD /c
# SUBTRACT CPP /Fr
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32

# PROP Target_Dir ""
F90=df.exe
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\Include" /I "..\..\Include" /I "..\..\..\Include" /I "..\Include\win" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "JIE_EXPORTS" /FR /FD /GZ /c
# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\Include" /I "..\..\Include" /I "..\..\..\..\include\Martini" /I "..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\BCI\Common" /I "..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\BCI\BCIEng" /I "..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\BCI\BCIEng\BCIEngJ" /I "..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\BCI\JClass" /D "_DEBUG" /D "IPF_ARCH" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "JIE_EXPORTS" /D "MARTINI_JIE" /D "VERIFIER_STANDALONE" /FD /GZ /c
# SUBTRACT CPP /Fr
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32

# End Source File
# Begin Source File

SOURCE="..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\BCI\BCIEng\BCIEngJ\class_interface.cpp"
# End Source File
# Begin Source File

SOURCE="..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\BCI\Common\Command.cpp"
# End Source File
# Begin Source File




!ENDIF 
	-@erase "$(INTDIR)\BCIToMIEInstructionMapper.obj"
	-@erase "$(INTDIR)\BciUtils.obj"
	-@erase "$(INTDIR)\class_interface.obj"
	-@erase "$(INTDIR)\Command.obj"
	-@erase "$(INTDIR)\ExtRefJ_Interface.obj"
	-@erase "$(INTDIR)\ExtRefJ_StatMethod.obj"

    if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"

F90=df.exe
CPP_PROJ=/nologo /MT /W3 /EHsc /Zi /O2 /I "..\Include" /I "..\..\Include" /I "..\..\..\..\include\Martini" /I "..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\BCI\Common" /I "..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\BCI\BCIEng" /I "..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\BCI\BCIEng\BCIEngJ" /I "..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\BCI\JClass" /I "..\..\..\..\..\..\org.apache.harmony_vmcore_verifier\src\include" /I "..\..\..\..\..\..\org.apache.harmony_vmcore_verifier\src\vmcore\include" /I "..\..\..\..\..\..\org.apache.harmony_vmcore_verifier\src\vmcore\src\verifier-3363\x_verifier" /I "$(JAVA_HOME)\include" /I "$(JAVA_HOME)\include\win32" /D "NDEBUG" /D "IA32_ARCH" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "JIE_EXPORTS" /D "MARTINI_JIE" /D "STATIC_BUILD" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 
BSC32=bscmake.exe
BSC32_FLAGS=/nologo /o"$(OUTDIR)\JIE.bsc" 
BSC32_SBRS= \
	
LINK32=link.exe
LINK32_FLAGS=kernel32.lib MartiniOSA.lib verifier.lib /nologo /dll /incremental:no /pdb:"$(OUTDIR)\JIE.pdb" /debug /machine:I386 /out:"$(OUTDIR)\JIE.dll" /implib:"$(OUTDIR)\JIE.lib" /libpath:"..\..\..\..\bin\windows\release\IA-32" /libpath:"..\..\..\..\..\..\org.apache.harmony_vmcore_verifier\lib\windows\release\IA-32" 
LINK32_OBJS= \
	"$(INTDIR)\BCIToMIEInstructionMapper.obj" \
	"$(INTDIR)\BciUtils.obj" \
	"$(INTDIR)\class_interface.obj" \
	"$(INTDIR)\Command.obj" \
	"$(INTDIR)\ExtRefJ_Interface.obj" \
	"$(INTDIR)\ExtRefJ_StatMethod.obj" \

	"$(INTDIR)\FlowGraphNode.obj" \
	"$(INTDIR)\InsSet.obj" \
	"$(INTDIR)\JavaClass.obj" \
	"$(INTDIR)\JavaField.obj" \
	"$(INTDIR)\JavaFields.obj" \
	"$(INTDIR)\JavaHelpers.obj" \
	"$(INTDIR)\JavaMethod.obj" \
	"$(INTDIR)\JavaMethods.obj" \

	"$(INTDIR)\Module.obj" \
	"$(INTDIR)\ModuleJ.obj" \
	"$(INTDIR)\WideStringUtils.obj" \
	"$(INTDIR)\BciUtils.obj" \
	"$(INTDIR)\JavaField.obj" \
	"$(INTDIR)\JavaFields.obj" \
	"$(OUTDIR)\LibraryLoader.lib" \
	"$(OUTDIR)\MartiniOSA.lib"


	-@erase "$(INTDIR)\BCIToMIEInstructionMapper.sbr"
	-@erase "$(INTDIR)\BciUtils.obj"
	-@erase "$(INTDIR)\BciUtils.sbr"
	-@erase "$(INTDIR)\class_interface.obj"
	-@erase "$(INTDIR)\class_interface.sbr"
	-@erase "$(INTDIR)\Command.obj"
	-@erase "$(INTDIR)\Command.sbr"
	-@erase "$(INTDIR)\ExtRefJ_Interface.obj"

    if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"

F90=df.exe
CPP_PROJ=/nologo /MTd /W3 /Gm /EHsc /ZI /Od /I "..\Include" /I "..\..\Include" /I "..\..\..\..\include\Martini" /I "..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\BCI\Common" /I "..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\BCI\BCIEng" /I "..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\BCI\BCIEng\BCIEngJ" /I "..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\BCI\JClass" /I "..\..\..\..\..\..\org.apache.harmony_vmcore_verifier\src\include" /I "..\..\..\..\..\..\org.apache.harmony_vmcore_verifier\src\vmcore\include" /I "..\..\..\..\..\..\org.apache.harmony_vmcore_verifier\src\vmcore\src\verifier-3363\x_verifier" /I "$(JAVA_HOME)\include" /I "$(JAVA_HOME)\include\win32" /D "_DEBUG" /D "IA32_ARCH" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "JIE_EXPORTS" /D "MARTINI_JIE" /D "STATIC_BUILD" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 
BSC32=bscmake.exe
BSC32_FLAGS=/nologo /o"$(OUTDIR)\JIE.bsc" 
BSC32_SBRS= \
	"$(INTDIR)\BCIToMIEInstructionMapper.sbr" \
	"$(INTDIR)\BciUtils.sbr" \
	"$(INTDIR)\class_interface.sbr" \
	"$(INTDIR)\Command.sbr" \
	"$(INTDIR)\ExtRefJ_Interface.sbr" \
	"$(INTDIR)\ExtRefJ_StatMethod.sbr" \

	"$(INTDIR)\FlowGraphNode.sbr" \
	"$(INTDIR)\InsSet.sbr" \
	"$(INTDIR)\JavaClass.sbr" \
	"$(INTDIR)\JavaField.sbr" \
	"$(INTDIR)\JavaFields.sbr" \
	"$(INTDIR)\JavaHelpers.sbr" \
	"$(INTDIR)\JavaMethod.sbr" \
	"$(INTDIR)\JavaMethods.sbr" \

	"$(INTDIR)\MIEProtectedBlock.sbr" \
	"$(INTDIR)\Module.sbr" \
	"$(INTDIR)\ModuleJ.sbr" \
	"$(INTDIR)\WideStringUtils.sbr"
	"$(INTDIR)\BciUtils.sbr" \
	"$(INTDIR)\JavaField.sbr" \
	"$(INTDIR)\JavaFields.sbr"

"$(OUTDIR)\JIE.bsc" : "$(OUTDIR)" $(BSC32_SBRS)
    $(BSC32) @<<

<<

LINK32=link.exe
LINK32_FLAGS=kernel32.lib MartiniOSA.lib verifier.lib /nologo /dll /incremental:yes /pdb:"$(OUTDIR)\JIE.pdb" /debug /machine:I386 /out:"$(OUTDIR)\JIE.dll" /implib:"$(OUTDIR)\JIE.lib" /pdbtype:sept /libpath:"..\..\..\..\bin\windows\debug\IA-32" /libpath:"..\..\..\..\..\..\org.apache.harmony_vmcore_verifier\lib\windows\debug\IA-32" 
LINK32_OBJS= \
	"$(INTDIR)\BCIToMIEInstructionMapper.obj" \
	"$(INTDIR)\BciUtils.obj" \
	"$(INTDIR)\class_interface.obj" \
	"$(INTDIR)\Command.obj" \
	"$(INTDIR)\ExtRefJ_Interface.obj" \
	"$(INTDIR)\ExtRefJ_StatMethod.obj" \

	"$(INTDIR)\FlowGraphNode.obj" \
	"$(INTDIR)\InsSet.obj" \
	"$(INTDIR)\JavaClass.obj" \
	"$(INTDIR)\JavaField.obj" \
	"$(INTDIR)\JavaFields.obj" \
	"$(INTDIR)\JavaHelpers.obj" \
	"$(INTDIR)\JavaMethod.obj" \
	"$(INTDIR)\JavaMethods.obj" \

	"$(INTDIR)\Module.obj" \
	"$(INTDIR)\ModuleJ.obj" \
	"$(INTDIR)\WideStringUtils.obj" \
	"$(INTDIR)\BciUtils.obj" \
	"$(INTDIR)\JavaField.obj" \
	"$(INTDIR)\JavaFields.obj" \
	"$(OUTDIR)\LibraryLoader.lib" \
	"$(OUTDIR)\MartiniOSA.lib"


!ENDIF 
	-@erase "$(INTDIR)\BCIToMIEInstructionMapper.obj"
	-@erase "$(INTDIR)\BciUtils.obj"
	-@erase "$(INTDIR)\class_interface.obj"
	-@erase "$(INTDIR)\Command.obj"
	-@erase "$(INTDIR)\ExtRefJ_Interface.obj"
	-@erase "$(INTDIR)\ExtRefJ_StatMethod.obj"

    if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"

F90=df.exe
CPP_PROJ=/nologo /MTd /W3 /EHsc /Zi /Od /I "..\Include" /I "..\..\Include" /I "..\..\..\..\include\Martini" /I "..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\BCI\Common" /I "..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\BCI\BCIEng" /I "..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\BCI\BCIEng\BCIEngJ" /I "..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\BCI\JClass" /I "..\..\..\..\..\..\org.apache.harmony_vmcore_verifier\src\include" /I "..\..\..\..\..\..\org.apache.harmony_vmcore_verifier\src\vmcore\include" /I "..\..\..\..\..\..\org.apache.harmony_vmcore_verifier\src\vmcore\src\verifier-3363\x_verifier" /I "$(JAVA_HOME)\include" /I "$(JAVA_HOME)\include\win32" /D "_DEBUG" /D "EM64T_ARCH" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "JIE_EXPORTS" /D "MARTINI_JIE" /D "STATIC_BUILD" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /c 
MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 
BSC32=bscmake.exe
BSC32_FLAGS=/nologo /o"$(OUTDIR)\JIE.bsc" 
BSC32_SBRS= \
	
LINK32=link.exe
LINK32_FLAGS=bufferoverflowu.lib kernel32.lib MartiniOSA.lib verifier.lib /nologo /dll /incremental:no /pdb:"$(OUTDIR)\JIE.pdb" /debug /machine:amd64 /out:"$(OUTDIR)\JIE.dll" /implib:"$(OUTDIR)\JIE.lib" /libpath:"..\..\..\..\bin\windows\debug\EM64T" /libpath:"..\..\..\..\..\..\org.apache.harmony_vmcore_verifier\lib\windows\debug\EM64T"
LINK32_OBJS= \
	"$(INTDIR)\BCIToMIEInstructionMapper.obj" \
	"$(INTDIR)\BciUtils.obj" \
	"$(INTDIR)\class_interface.obj" \
	"$(INTDIR)\Command.obj" \
	"$(INTDIR)\ExtRefJ_Interface.obj" \
	"$(INTDIR)\ExtRefJ_StatMethod.obj" \

	"$(INTDIR)\FlowGraphNode.obj" \
	"$(INTDIR)\InsSet.obj" \
	"$(INTDIR)\JavaClass.obj" \
	"$(INTDIR)\JavaField.obj" \
	"$(INTDIR)\JavaFields.obj" \
	"$(INTDIR)\JavaHelpers.obj" \
	"$(INTDIR)\JavaMethod.obj" \
	"$(INTDIR)\JavaMethods.obj" \

	"$(INTDIR)\Module.obj" \
	"$(INTDIR)\ModuleJ.obj" \
	"$(INTDIR)\WideStringUtils.obj" \
	"$(INTDIR)\BciUtils.obj" \
	"$(INTDIR)\JavaField.obj" \
	"$(INTDIR)\JavaFields.obj" \
	"$(OUTDIR)\LibraryLoader.lib" \
	"$(OUTDIR)\MartiniOSA.lib"


!ENDIF 
	-@erase "$(INTDIR)\BCIToMIEInstructionMapper.obj"
	-@erase "$(INTDIR)\BciUtils.obj"
	-@erase "$(INTDIR)\class_interface.obj"
	-@erase "$(INTDIR)\Command.obj"
	-@erase "$(INTDIR)\ExtRefJ_Interface.obj"
	-@erase "$(INTDIR)\ExtRefJ_StatMethod.obj"

    if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"

F90=df.exe
CPP_PROJ=/nologo /MT /W3 /EHsc /O2 /I "..\Include" /I "..\..\Include" /I "..\..\..\..\include\Martini" /I "..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\BCI\Common" /I "..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\BCI\BCIEng" /I "..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\BCI\BCIEng\BCIEngJ" /I "..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\BCI\JClass" /I "..\..\..\..\..\..\org.apache.harmony_vmcore_verifier\src\include" /I "..\..\..\..\..\..\org.apache.harmony_vmcore_verifier\src\vmcore\include" /I "..\..\..\..\..\..\org.apache.harmony_vmcore_verifier\src\vmcore\src\verifier-3363\x_verifier" /I "$(JAVA_HOME)\include" /I "$(JAVA_HOME)\include\win32" /D "NDEBUG" /D "EM64T_ARCH" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "JIE_EXPORTS" /D "MARTINI_JIE" /D "STATIC_BUILD" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /c 
MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 
BSC32=bscmake.exe
BSC32_FLAGS=/nologo /o"$(OUTDIR)\JIE.bsc" 
BSC32_SBRS= \
	
LINK32=link.exe
LINK32_FLAGS=bufferoverflowu.lib kernel32.lib MartiniOSA.lib verifier.lib /nologo /dll /incremental:no /pdb:"$(OUTDIR)\JIE.pdb" /debug /machine:amd64 /out:"$(OUTDIR)\JIE.dll" /implib:"$(OUTDIR)\JIE.lib" /libpath:"..\..\..\..\bin\windows\release\EM64T" /libpath:"..\..\..\..\..\..\org.apache.harmony_vmcore_verifier\lib\windows\release\EM64T" 
LINK32_OBJS= \
	"$(INTDIR)\BCIToMIEInstructionMapper.obj" \
	"$(INTDIR)\BciUtils.obj" \
	"$(INTDIR)\class_interface.obj" \
	"$(INTDIR)\Command.obj" \
	"$(INTDIR)\ExtRefJ_Interface.obj" \
	"$(INTDIR)\ExtRefJ_StatMethod.obj" \

	"$(INTDIR)\FlowGraphNode.obj" \
	"$(INTDIR)\InsSet.obj" \
	"$(INTDIR)\JavaClass.obj" \
	"$(INTDIR)\JavaField.obj" \
	"$(INTDIR)\JavaFields.obj" \
	"$(INTDIR)\JavaHelpers.obj" \
	"$(INTDIR)\JavaMethod.obj" \
	"$(INTDIR)\JavaMethods.obj" \

	"$(INTDIR)\Module.obj" \
	"$(INTDIR)\ModuleJ.obj" \
	"$(INTDIR)\WideStringUtils.obj" \
	"$(INTDIR)\BciUtils.obj" \
	"$(INTDIR)\JavaField.obj" \
	"$(INTDIR)\JavaFields.obj" \
	"$(OUTDIR)\LibraryLoader.lib" \
	"$(OUTDIR)\MartiniOSA.lib"


!ENDIF 
	-@erase "$(INTDIR)\BCIToMIEInstructionMapper.obj"
	-@erase "$(INTDIR)\BciUtils.obj"
	-@erase "$(INTDIR)\class_interface.obj"
	-@erase "$(INTDIR)\Command.obj"
	-@erase "$(INTDIR)\ExtRefJ_Interface.obj"
	-@erase "$(INTDIR)\ExtRefJ_StatMethod.obj"

    if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"

F90=df.exe
CPP_PROJ=/nologo /MT /W3 /EHsc /Zi /O2 /I "..\Include" /I "..\..\Include" /I "..\..\..\..\include\Martini" /I "..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\BCI\Common" /I "..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\BCI\BCIEng" /I "..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\BCI\BCIEng\BCIEngJ" /I "..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\BCI\JClass" /I "..\..\..\..\..\..\org.apache.harmony_vmcore_verifier\src\include" /I "..\..\..\..\..\..\org.apache.harmony_vmcore_verifier\src\vmcore\include" /I "..\..\..\..\..\..\org.apache.harmony_vmcore_verifier\src\vmcore\src\verifier-3363\x_verifier" /I "$(JAVA_HOME)\include" /I "$(JAVA_HOME)\include\win32" /D "NDEBUG" /D "IPF_ARCH" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "JIE_EXPORTS" /D "MARTINI_JIE" /D "STATIC_BUILD" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 
BSC32=bscmake.exe
BSC32_FLAGS=/nologo /o"$(OUTDIR)\JIE.bsc" 
BSC32_SBRS= \
	
LINK32=link.exe
LINK32_FLAGS=bufferoverflowu.lib kernel32.lib MartiniOSA.lib verifier.lib /nologo /dll /incremental:no /pdb:"$(OUTDIR)\JIE.pdb" /debug /machine:IA64 /out:"$(OUTDIR)\JIE.dll" /implib:"$(OUTDIR)\JIE.lib" /libpath:"..\..\..\..\IA64Release" /libpath:"..\..\..\..\bin\windows\release\IPF" /libpath:"..\..\..\..\..\..\org.apache.harmony_vmcore_verifier\lib\windows\release\IPF" 
LINK32_OBJS= \
	"$(INTDIR)\BCIToMIEInstructionMapper.obj" \
	"$(INTDIR)\BciUtils.obj" \
	"$(INTDIR)\class_interface.obj" \
	"$(INTDIR)\Command.obj" \
	"$(INTDIR)\ExtRefJ_Interface.obj" \
	"$(INTDIR)\ExtRefJ_StatMethod.obj" \

	"$(INTDIR)\FlowGraphNode.obj" \
	"$(INTDIR)\InsSet.obj" \
	"$(INTDIR)\JavaClass.obj" \
	"$(INTDIR)\JavaField.obj" \
	"$(INTDIR)\JavaFields.obj" \
	"$(INTDIR)\JavaHelpers.obj" \
	"$(INTDIR)\JavaMethod.obj" \
	"$(INTDIR)\JavaMethods.obj" \

	"$(INTDIR)\Module.obj" \
	"$(INTDIR)\ModuleJ.obj" \
	"$(INTDIR)\WideStringUtils.obj" \
	"$(INTDIR)\BciUtils.obj" \
	"$(INTDIR)\JavaField.obj" \
	"$(INTDIR)\JavaFields.obj" \
	"$(OUTDIR)\LibraryLoader.lib" \
	"$(OUTDIR)\MartiniOSA.lib"


!ENDIF 
	-@erase "$(INTDIR)\BCIToMIEInstructionMapper.obj"
	-@erase "$(INTDIR)\BciUtils.obj"
	-@erase "$(INTDIR)\class_interface.obj"
	-@erase "$(INTDIR)\Command.obj"
	-@erase "$(INTDIR)\ExtRefJ_Interface.obj"
	-@erase "$(INTDIR)\ExtRefJ_StatMethod.obj"

    if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"

F90=df.exe
CPP_PROJ=/nologo /MTd /W3 /EHsc /Zi /Od /I "..\Include" /I "..\..\Include" /I "..\..\..\..\include\Martini" /I "..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\BCI\Common" /I "..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\BCI\BCIEng" /I "..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\BCI\BCIEng\BCIEngJ" /I "..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\BCI\JClass" /I "..\..\..\..\..\..\org.apache.harmony_vmcore_verifier\src\include" /I "..\..\..\..\..\..\org.apache.harmony_vmcore_verifier\src\vmcore\include" /I "..\..\..\..\..\..\org.apache.harmony_vmcore_verifier\src\vmcore\src\verifier-3363\x_verifier" /I "$(JAVA_HOME)\include" /I "$(JAVA_HOME)\include\win32" /D "_DEBUG" /D "IPF_ARCH" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "JIE_EXPORTS" /D "MARTINI_JIE" /D "STATIC_BUILD" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /c 
MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 
BSC32=bscmake.exe
BSC32_FLAGS=/nologo /o"$(OUTDIR)\JIE.bsc" 
BSC32_SBRS= \
	
LINK32=link.exe
LINK32_FLAGS=bufferoverflowu.lib kernel32.lib MartiniOSA.lib verifier.lib /nologo /dll /incremental:no /pdb:"$(OUTDIR)\JIE.pdb" /debug /machine:IA64 /out:"$(OUTDIR)\JIE.dll" /implib:"$(OUTDIR)\JIE.lib" /libpath:"..\..\..\..\bin\windows\debug\IPF" /libpath:"..\..\..\..\..\..\org.apache.harmony_vmcore_verifier\lib\windows\debug\IPF" 
LINK32_OBJS= \
	"$(INTDIR)\BCIToMIEInstructionMapper.obj" \
	"$(INTDIR)\BciUtils.obj" \
	"$(INTDIR)\class_interface.obj" \
	"$(INTDIR)\Command.obj" \
	"$(INTDIR)\ExtRefJ_Interface.obj" \
	"$(INTDIR)\ExtRefJ_StatMethod.obj" \

	"$(INTDIR)\FlowGraphNode.obj" \
	"$(INTDIR)\InsSet.obj" \
	"$(INTDIR)\JavaClass.obj" \
	"$(INTDIR)\JavaField.obj" \
	"$(INTDIR)\JavaFields.obj" \
	"$(INTDIR)\JavaHelpers.obj" \
	"$(INTDIR)\JavaMethod.obj" \
	"$(INTDIR)\JavaMethods.obj" \

	"$(INTDIR)\Module.obj" \
	"$(INTDIR)\ModuleJ.obj" \
	"$(INTDIR)\WideStringUtils.obj" \
	"$(INTDIR)\BciUtils.obj" \
	"$(INTDIR)\JavaField.obj" \
	"$(INTDIR)\JavaFields.obj" \
	"$(OUTDIR)\LibraryLoader.lib" \
	"$(OUTDIR)\MartiniOSA.lib"



!ENDIF 

SOURCE="..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\BCI\BCIEng\BCIEngJ\class_interface.cpp"

!IF  "$(CFG)" == "JIE - Win32 IA32 Release"


"$(INTDIR)\class_interface.obj" : $(SOURCE) "$(INTDIR)"
	$(CPP) $(CPP_PROJ) $(SOURCE)


!ELSEIF  "$(CFG)" == "JIE - Win32 IA32 Debug"


"$(INTDIR)\class_interface.obj"	"$(INTDIR)\class_interface.sbr" : $(SOURCE) "$(INTDIR)"
	$(CPP) $(CPP_PROJ) $(SOURCE)


!ELSEIF  "$(CFG)" == "JIE - Win32 EM64T Debug"


"$(INTDIR)\class_interface.obj" : $(SOURCE) "$(INTDIR)"
	$(CPP) $(CPP_PROJ) $(SOURCE)


!ELSEIF  "$(CFG)" == "JIE - Win32 EM64T Release"


"$(INTDIR)\class_interface.obj" : $(SOURCE) "$(INTDIR)"
	$(CPP) $(CPP_PROJ) $(SOURCE)


!ELSEIF  "$(CFG)" == "JIE - Win32 IPF Release"


"$(INTDIR)\class_interface.obj" : $(SOURCE) "$(INTDIR)"
	$(CPP) $(CPP_PROJ) $(SOURCE)


!ELSEIF  "$(CFG)" == "JIE - Win32 IPF Debug"


"$(INTDIR)\class_interface.obj" : $(SOURCE) "$(INTDIR)"
	$(CPP) $(CPP_PROJ) $(SOURCE)


!ENDIF 

SOURCE="..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\BCI\Common\Command.cpp"

!IF  "$(CFG)" == "JIE - Win32 IA32 Release"




$(OBJDIR)/BCIToMIEInstructionMapper.o: BCIToMIEInstructionMapper.cpp \
  BCIToMIEInstructionMapper.h ../../../../include/Martini/MieAPI.h \
  ../../../../include/Martini/MRTEResults.h \
  ../../../../include/Martini/MRTETypes.h \

  ../../../../../../org.eclipse.hyades.probekit/src-native/BCI/BCIEng/BCIEngJ/JVMInsSet.h
	$(CPP_COMPILE)

$(OBJDIR)/BciUtils.o: BciUtils.cpp BciUtils.h ../Include/WideStringUtils.h \
  ../../../../include/Martini/MpiAPI.h \
  ../../../../include/Martini/MRTEResults.h \
  ../../../../include/Martini/MRTETypes.h \
  ../../../../include/Martini/MRTEResults.h \
  ../../../../include/Martini/MieAPI.h \
  ../../../../include/Martini/MIterator.h \
  ../../../../include/Martini/PsuedoMnemonics \
  ../../../../include/Martini/MieSpecialMnemonics \
  ../../../../include/Martini/MpiBase.h \
  ../../../../../../org.eclipse.hyades.probekit/src-native/BCI/JClass/JClassFile.h \
  ../../../../../../org.eclipse.hyades.probekit/src-native/BCI/Common/CommonDef.h \
  ../../../../../../org.eclipse.hyades.probekit/src-native/BCI/Common/JavaDef.h \
  ../../../../../../org.eclipse.hyades.probekit/src-native/BCI/JClass/JStream.h \
  ../../../../../../org.eclipse.hyades.probekit/src-native/BCI/JClass/JBaseStream.h
	$(CPP_COMPILE)

$(OBJDIR)/class_interface.o:  \
 ../../../../../../org.eclipse.hyades.probekit/src-native/BCI/BCIEng/BCIEngJ/class_interface.cpp \
  ../../../../../../org.eclipse.hyades.probekit/src-native/BCI/BCIEng/BCIEngJ/class_inerface_int.h \
  ../../../../../../org.apache.harmony_vmcore_verifier/src/vmcore/src/verifier-3363/x_verifier/x_class_interface.h \
  ../../../../../../org.apache.harmony_vmcore_verifier/src/include/open/types.h \
  ../../../../../../org.apache.harmony_vmcore_verifier/src/include/open/platform_types.h \
  ../../../../../../org.apache.harmony_vmcore_verifier/src/include/open/common.h \
  ../../../../../../org.apache.harmony_vmcore_verifier/src/include/open/hycomp.h \
  ../../../../../../org.apache.harmony_vmcore_verifier/src/vmcore/src/verifier-3363/x_verifier/x_verifier.h \
  ../../../../../../org.apache.harmony_vmcore_verifier/src/vmcore/include/verifier.h \
  ../../../../../../org.eclipse.hyades.probekit/src-native/BCI/JClass/JClassBuilder.h \
  ../../../../../../org.eclipse.hyades.probekit/src-native/BCI/Common/CommonDef.h \
  ../../../../../../org.eclipse.hyades.probekit/src-native/BCI/Common/JavaHelpers.h \
  ../../../../../../org.eclipse.hyades.probekit/src-native/BCI/Common/JavaDef.h \
  ../../../../../../org.eclipse.hyades.probekit/src-native/BCI/JClass/JClassFile.h \
  ../../../../../../org.eclipse.hyades.probekit/src-native/BCI/JClass/JStream.h \
  ../../../../../../org.eclipse.hyades.probekit/src-native/BCI/JClass/JBaseStream.h \
  ../../../../../../org.eclipse.hyades.probekit/src-native/BCI/BCIEng/BCIEng.h \
  ../../../../../../org.eclipse.hyades.probekit/src-native/BCI/BCIEng/Module.h \
  ../../../../../../org.eclipse.hyades.probekit/src-native/BCI/BCIEng/InsSet.h \
  ../../../../../../org.eclipse.hyades.probekit/src-native/BCI/BCIEng/BCIEngJ/ModuleJ.h \
  ../../../../../../org.eclipse.hyades.probekit/src-native/BCI/JClass/JMemStream.h \
  ../../../../../../org.apache.harmony_vmcore_verifier/src/include/jni.h \
  ../../../../../../org.apache.harmony_vmcore_verifier/src/include/jni_types.h
	$(CPP_COMPILE)

$(OBJDIR)/Command.o:  \
 ../../../../../../org.eclipse.hyades.probekit/src-native/BCI/Common/Command.cpp \
  ../../../../../../org.eclipse.hyades.probekit/src-native/BCI/Common/Command.h \

 ../../../../../../org.eclipse.hyades.probekit/src-native/BCI/BCIEng/BCIEngJ/ExtRefJ_Interface.cpp \
  ../../../../../../org.eclipse.hyades.probekit/src-native/BCI/BCIEng/BCIEngJ/ExtRefJ_Interface.h \
  ../../../../../../org.eclipse.hyades.probekit/src-native/BCI/BCIEng/BCIEngJ/ModuleJ.h \
  ../../../../../../org.eclipse.hyades.probekit/src-native/BCI/BCIEng/BCIEngJ/class_inerface_int.h \
  ../../../../../../org.apache.harmony_vmcore_verifier/src/vmcore/src/verifier-3363/x_verifier/x_class_interface.h \
  ../../../../../../org.apache.harmony_vmcore_verifier/src/include/open/types.h \
  ../../../../../../org.apache.harmony_vmcore_verifier/src/include/open/platform_types.h \
  ../../../../../../org.apache.harmony_vmcore_verifier/src/include/open/common.h \
  ../../../../../../org.apache.harmony_vmcore_verifier/src/include/open/hycomp.h \
  ../../../../../../org.apache.harmony_vmcore_verifier/src/vmcore/src/verifier-3363/x_verifier/x_verifier.h \
  ../../../../../../org.apache.harmony_vmcore_verifier/src/vmcore/include/verifier.h \
  ../../../../../../org.eclipse.hyades.probekit/src-native/BCI/JClass/JClassBuilder.h \
  ../../../../../../org.eclipse.hyades.probekit/src-native/BCI/Common/CommonDef.h \
  ../../../../../../org.eclipse.hyades.probekit/src-native/BCI/Common/JavaHelpers.h \
  ../../../../../../org.eclipse.hyades.probekit/src-native/BCI/Common/JavaDef.h \
  ../../../../../../org.eclipse.hyades.probekit/src-native/BCI/JClass/JClassFile.h \
  ../../../../../../org.eclipse.hyades.probekit/src-native/BCI/JClass/JStream.h \
  ../../../../../../org.eclipse.hyades.probekit/src-native/BCI/JClass/JBaseStream.h \
  ../../../../../../org.eclipse.hyades.probekit/src-native/BCI/BCIEng/Module.h \
  ../../../../../../org.eclipse.hyades.probekit/src-native/BCI/BCIEng/InsSet.h
	$(CPP_COMPILE)

$(OBJDIR)/ExtRefJ_StatMethod.o:  \
 ../../../../../../org.eclipse.hyades.probekit/src-native/BCI/BCIEng/BCIEngJ/ExtRefJ_StatMethod.cpp \
  ../../../../../../org.eclipse.hyades.probekit/src-native/BCI/BCIEng/BCIEngJ/ExtRefJ_StatMethod.h \
  ../../../../../../org.eclipse.hyades.probekit/src-native/BCI/BCIEng/BCIEngJ/ModuleJ.h \
  ../../../../../../org.eclipse.hyades.probekit/src-native/BCI/BCIEng/BCIEngJ/class_inerface_int.h \
  ../../../../../../org.apache.harmony_vmcore_verifier/src/vmcore/src/verifier-3363/x_verifier/x_class_interface.h \
  ../../../../../../org.apache.harmony_vmcore_verifier/src/include/open/types.h \
  ../../../../../../org.apache.harmony_vmcore_verifier/src/include/open/platform_types.h \
  ../../../../../../org.apache.harmony_vmcore_verifier/src/include/open/common.h \
  ../../../../../../org.apache.harmony_vmcore_verifier/src/include/open/hycomp.h \
  ../../../../../../org.apache.harmony_vmcore_verifier/src/vmcore/src/verifier-3363/x_verifier/x_verifier.h \
  ../../../../../../org.apache.harmony_vmcore_verifier/src/vmcore/include/verifier.h \
  ../../../../../../org.eclipse.hyades.probekit/src-native/BCI/JClass/JClassBuilder.h \
  ../../../../../../org.eclipse.hyades.probekit/src-native/BCI/Common/CommonDef.h \
  ../../../../../../org.eclipse.hyades.probekit/src-native/BCI/Common/JavaHelpers.h \
  ../../../../../../org.eclipse.hyades.probekit/src-native/BCI/Common/JavaDef.h \
  ../../../../../../org.eclipse.hyades.probekit/src-native/BCI/JClass/JClassFile.h \
  ../../../../../../org.eclipse.hyades.probekit/src-native/BCI/JClass/JStream.h \
  ../../../../../../org.eclipse.hyades.probekit/src-native/BCI/JClass/JBaseStream.h \
  ../../../../../../org.eclipse.hyades.probekit/src-native/BCI/BCIEng/Module.h \
  ../../../../../../org.eclipse.hyades.probekit/src-native/BCI/BCIEng/InsSet.h
	$(CPP_COMPILE)

$(OBJDIR)/FlowGraph.o: FlowGraph.cpp FlowGraph.h ../../Include/MList.h \
  ../../../../include/Martini/MRTEResults.h \
  ../../../../include/Martini/MRTETypes.h \
  ../../../../include/Martini/MIterator.h ../../Include/MHash.h \

  ../Include/ValidityChecks.h MIEInstructionFactory.h
	$(CPP_COMPILE)

$(OBJDIR)/FlowGraphNode.o: FlowGraphNode.cpp FlowGraphNode.h \
  ../../../../include/Martini/MRTETypes.h MIEInstruction.h \
  ../../../../include/Martini/MieAPI.h \
  ../../../../include/Martini/MRTEResults.h \

  ../../../../../../org.eclipse.hyades.probekit/src-native/BCI/BCIEng/InsSet.h
	$(CPP_COMPILE)

$(OBJDIR)/JavaClass.o: JavaClass.cpp ../Include/MRTEInfrastructureDefinitions.h \
  ../../../../include/Martini/MpiAPI.h \
  ../../../../include/Martini/MRTETypes.h \
  ../../../../include/Martini/MRTEResults.h \

  ../../../../../../org.eclipse.hyades.probekit/src-native/BCI/JClass/JBaseStream.h \
  JavaMethods.h ../../Include/MList.h JavaFields.h \
  ../../../../../../org.eclipse.hyades.probekit/src-native/BCI/BCIEng/BCIEngJ/ModuleJ.h \
  ../../../../../../org.eclipse.hyades.probekit/src-native/BCI/BCIEng/BCIEngJ/class_inerface_int.h \
  ../../../../../../org.apache.harmony_vmcore_verifier/src/vmcore/src/verifier-3363/x_verifier/x_class_interface.h \
  ../../../../../../org.apache.harmony_vmcore_verifier/src/include/open/types.h \
  ../../../../../../org.apache.harmony_vmcore_verifier/src/include/open/platform_types.h \
  ../../../../../../org.apache.harmony_vmcore_verifier/src/include/open/common.h \
  ../../../../../../org.apache.harmony_vmcore_verifier/src/include/open/hycomp.h \
  ../../../../../../org.apache.harmony_vmcore_verifier/src/vmcore/src/verifier-3363/x_verifier/x_verifier.h \
  ../../../../../../org.apache.harmony_vmcore_verifier/src/vmcore/include/verifier.h \
  ../../../../../../org.eclipse.hyades.probekit/src-native/BCI/BCIEng/Module.h \
  ../../../../../../org.eclipse.hyades.probekit/src-native/BCI/BCIEng/InsSet.h \
  JavaMethod.h MethodInstrumentor.h FlowGraph.h ../../Include/MHash.h \

  MIEInstructionFactory.h BciUtils.h ../Include/WideStringUtils.h
	$(CPP_COMPILE)

$(OBJDIR)/JavaField.o: JavaField.cpp JavaField.h ../../Include/JIE.h \
  ../../../../include/Martini/MRTEResults.h \
  ../../../../include/Martini/MRTETypes.h \
  ../../../../include/Martini/MieAPI.h \

  ../../../../../../org.eclipse.hyades.probekit/src-native/BCI/JClass/JBaseStream.h \
  JavaMethods.h ../../Include/MList.h JavaFields.h \
  ../../../../../../org.eclipse.hyades.probekit/src-native/BCI/BCIEng/BCIEngJ/ModuleJ.h \
  ../../../../../../org.eclipse.hyades.probekit/src-native/BCI/BCIEng/BCIEngJ/class_inerface_int.h \
  ../../../../../../org.apache.harmony_vmcore_verifier/src/vmcore/src/verifier-3363/x_verifier/x_class_interface.h \
  ../../../../../../org.apache.harmony_vmcore_verifier/src/include/open/types.h \
  ../../../../../../org.apache.harmony_vmcore_verifier/src/include/open/platform_types.h \
  ../../../../../../org.apache.harmony_vmcore_verifier/src/include/open/common.h \
  ../../../../../../org.apache.harmony_vmcore_verifier/src/include/open/hycomp.h \
  ../../../../../../org.apache.harmony_vmcore_verifier/src/vmcore/src/verifier-3363/x_verifier/x_verifier.h \
  ../../../../../../org.apache.harmony_vmcore_verifier/src/vmcore/include/verifier.h \
  ../../../../../../org.eclipse.hyades.probekit/src-native/BCI/BCIEng/Module.h \
  ../../../../../../org.eclipse.hyades.probekit/src-native/BCI/BCIEng/InsSet.h \
  BciUtils.h ../Include/WideStringUtils.h \
  ../../../../include/Martini/MpiAPI.h \
  ../../../../include/Martini/MpiBase.h
	$(CPP_COMPILE)

$(OBJDIR)/JavaFields.o: JavaFields.cpp JavaFields.h ../../Include/JIE.h \
  ../../../../include/Martini/MRTEResults.h \
  ../../../../include/Martini/MRTETypes.h \
  ../../../../include/Martini/MieAPI.h \

  ../../../../../../org.eclipse.hyades.probekit/src-native/BCI/Common/JavaDef.h
	$(CPP_COMPILE)

$(OBJDIR)/JavaMethod.o: JavaMethod.cpp ../Include/MRTEInfrastructureDefinitions.h \
  ../../../../include/Martini/MpiAPI.h \
  ../../../../include/Martini/MRTETypes.h \
  ../../../../include/Martini/MRTEResults.h \

  ../../../../include/Martini/MpiBase.h ../../Include/MString.h \
  JavaMethod.h ../../Include/JIE.h ../../../../include/Martini/OSA.h \
  ../../../../../../org.eclipse.hyades.probekit/src-native/BCI/BCIEng/BCIEngJ/ModuleJ.h \
  ../../../../../../org.eclipse.hyades.probekit/src-native/BCI/BCIEng/BCIEngJ/class_inerface_int.h \
  ../../../../../../org.apache.harmony_vmcore_verifier/src/vmcore/src/verifier-3363/x_verifier/x_class_interface.h \
  ../../../../../../org.apache.harmony_vmcore_verifier/src/include/open/types.h \
  ../../../../../../org.apache.harmony_vmcore_verifier/src/include/open/platform_types.h \
  ../../../../../../org.apache.harmony_vmcore_verifier/src/include/open/common.h \
  ../../../../../../org.apache.harmony_vmcore_verifier/src/include/open/hycomp.h \
  ../../../../../../org.apache.harmony_vmcore_verifier/src/vmcore/src/verifier-3363/x_verifier/x_verifier.h \
  ../../../../../../org.apache.harmony_vmcore_verifier/src/vmcore/include/verifier.h \
  ../../../../../../org.eclipse.hyades.probekit/src-native/BCI/JClass/JClassBuilder.h \
  ../../../../../../org.eclipse.hyades.probekit/src-native/BCI/Common/CommonDef.h \
  ../../../../../../org.eclipse.hyades.probekit/src-native/BCI/Common/JavaHelpers.h \
  ../../../../../../org.eclipse.hyades.probekit/src-native/BCI/Common/JavaDef.h \
  ../../../../../../org.eclipse.hyades.probekit/src-native/BCI/JClass/JClassFile.h \
  ../../../../../../org.eclipse.hyades.probekit/src-native/BCI/JClass/JStream.h \
  ../../../../../../org.eclipse.hyades.probekit/src-native/BCI/JClass/JBaseStream.h \
  ../../../../../../org.eclipse.hyades.probekit/src-native/BCI/BCIEng/Module.h \
  ../../../../../../org.eclipse.hyades.probekit/src-native/BCI/BCIEng/InsSet.h \
  MethodInstrumentor.h FlowGraph.h ../../Include/MList.h \
  ../../Include/MHash.h FlowGraphNode.h MIEInstruction.h JavaClass.h \
  JavaMethods.h JavaFields.h JIEInstructionCodec.h MIEInstructionCodec.h \

  ../Include/WideStringUtils.h JIEUtils.h
	$(CPP_COMPILE)

$(OBJDIR)/JavaMethods.o: JavaMethods.cpp JavaMethods.h ../../Include/JIE.h \
  ../../../../include/Martini/MRTEResults.h \
  ../../../../include/Martini/MRTETypes.h \
  ../../../../include/Martini/MieAPI.h \


$(OBJDIR)/JClassFile.o:  \
 ../../../../../../org.eclipse.hyades.probekit/src-native/BCI/JClass/JClassFile.cpp \
  ../../../../../../org.eclipse.hyades.probekit/src-native/BCI/Common/JavaDef.h \
  ../../../../../../org.eclipse.hyades.probekit/src-native/BCI/Common/CommonDef.h \
  ../../../../../../org.eclipse.hyades.probekit/src-native/BCI/JClass/JClassFile.h \
  ../../../../../../org.eclipse.hyades.probekit/src-native/BCI/JClass/JavaDef.h \
  ../../../../../../org.eclipse.hyades.probekit/src-native/BCI/JClass/JStream.h \
  ../../../../../../org.eclipse.hyades.probekit/src-native/BCI/JClass/JBaseStream.h \
  ../../../../../../org.eclipse.hyades.probekit/src-native/BCI/JClass/JMemStream.h
	$(CPP_COMPILE)

$(OBJDIR)/JFileStream.o:  \
 ../../../../../../org.eclipse.hyades.probekit/src-native/BCI/JClass/JFileStream.cpp \
  ../../../../../../org.eclipse.hyades.probekit/src-native/BCI/Common/CommonDef.h \
  ../../../../../../org.eclipse.hyades.probekit/src-native/BCI/JClass/JFileStream.h \
  ../../../../../../org.eclipse.hyades.probekit/src-native/BCI/Common/JavaDef.h \
  ../../../../../../org.eclipse.hyades.probekit/src-native/BCI/JClass/JBaseStream.h
	$(CPP_COMPILE)

$(OBJDIR)/JIE.o: JIE.cpp JIEImpl.h ../../Include/JIE.h \
  ../../../../include/Martini/MRTEResults.h \
  ../../../../include/Martini/MRTETypes.h \
  ../../../../include/Martini/MieAPI.h \

  ../../../../../../org.eclipse.hyades.probekit/src-native/BCI/JClass/JBaseStream.h \
  JavaMethods.h ../../Include/MList.h JavaFields.h \
  ../../../../../../org.eclipse.hyades.probekit/src-native/BCI/BCIEng/BCIEngJ/ModuleJ.h \
  ../../../../../../org.eclipse.hyades.probekit/src-native/BCI/BCIEng/BCIEngJ/class_inerface_int.h \
  ../../../../../../org.apache.harmony_vmcore_verifier/src/vmcore/src/verifier-3363/x_verifier/x_class_interface.h \
  ../../../../../../org.apache.harmony_vmcore_verifier/src/include/open/types.h \
  ../../../../../../org.apache.harmony_vmcore_verifier/src/include/open/platform_types.h \
  ../../../../../../org.apache.harmony_vmcore_verifier/src/include/open/common.h \
  ../../../../../../org.apache.harmony_vmcore_verifier/src/include/open/hycomp.h \
  ../../../../../../org.apache.harmony_vmcore_verifier/src/vmcore/src/verifier-3363/x_verifier/x_verifier.h \
  ../../../../../../org.apache.harmony_vmcore_verifier/src/vmcore/include/verifier.h \
  ../../../../../../org.eclipse.hyades.probekit/src-native/BCI/BCIEng/Module.h \
  ../../../../../../org.eclipse.hyades.probekit/src-native/BCI/BCIEng/InsSet.h
	$(CPP_COMPILE)

$(OBJDIR)/JIEInstructionCodec.o: JIEInstructionCodec.cpp \
  ../Include/MRTEInfrastructureDefinitions.h \
  ../../../../include/Martini/MpiAPI.h \
  ../../../../include/Martini/MRTETypes.h \

  ../../../../../../org.eclipse.hyades.probekit/src-native/BCI/JClass/JBaseStream.h \
  MIEProtectedBlock.h \
  ../../../../../../org.eclipse.hyades.probekit/src-native/BCI/BCIEng/BCIEngJ/ModuleJ.h \
  ../../../../../../org.eclipse.hyades.probekit/src-native/BCI/BCIEng/BCIEngJ/class_inerface_int.h \
  ../../../../../../org.apache.harmony_vmcore_verifier/src/vmcore/src/verifier-3363/x_verifier/x_class_interface.h \
  ../../../../../../org.apache.harmony_vmcore_verifier/src/include/open/types.h \
  ../../../../../../org.apache.harmony_vmcore_verifier/src/include/open/platform_types.h \
  ../../../../../../org.apache.harmony_vmcore_verifier/src/include/open/common.h \
  ../../../../../../org.apache.harmony_vmcore_verifier/src/include/open/hycomp.h \
  ../../../../../../org.apache.harmony_vmcore_verifier/src/vmcore/src/verifier-3363/x_verifier/x_verifier.h \
  ../../../../../../org.apache.harmony_vmcore_verifier/src/vmcore/include/verifier.h \
  ../Include/ValidityChecks.h MIEInstructionFactory.h
	$(CPP_COMPILE)

$(OBJDIR)/JIEUtils.o: JIEUtils.cpp JIEUtils.h \
  ../../../../include/Martini/MRTETypes.h \
  ../../../../include/Martini/MRTEResults.h ../../Include/MString.h \
  ../../../../../../org.eclipse.hyades.probekit/src-native/BCI/Common/JavaHelpers.h \

 ../../../../../../org.eclipse.hyades.probekit/src-native/BCI/JClass/JMemStream.cpp \
  ../../../../../../org.eclipse.hyades.probekit/src-native/BCI/JClass/JMemStream.h \
  ../../../../../../org.eclipse.hyades.probekit/src-native/BCI/Common/CommonDef.h \
  ../../../../../../org.eclipse.hyades.probekit/src-native/BCI/Common/JavaDef.h \
  ../../../../../../org.eclipse.hyades.probekit/src-native/BCI/JClass/JBaseStream.h
	$(CPP_COMPILE)


 ../../../../../../org.eclipse.hyades.probekit/src-native/BCI/JClass/JStream.cpp \
  ../../../../../../org.eclipse.hyades.probekit/src-native/BCI/Common/CommonDef.h \
  ../../../../../../org.eclipse.hyades.probekit/src-native/BCI/JClass/JStream.h \
  ../../../../../../org.eclipse.hyades.probekit/src-native/BCI/Common/JavaDef.h \
  ../../../../../../org.eclipse.hyades.probekit/src-native/BCI/JClass/JBaseStream.h
	$(CPP_COMPILE)

$(OBJDIR)/JVMInsSet.o:  \
 ../../../../../../org.eclipse.hyades.probekit/src-native/BCI/BCIEng/BCIEngJ/JVMInsSet.cpp \
  ../../../../../../org.eclipse.hyades.probekit/src-native/BCI/BCIEng/BCIEngJ/ModuleJ.h \
  ../../../../../../org.eclipse.hyades.probekit/src-native/BCI/BCIEng/BCIEngJ/class_inerface_int.h \
  ../../../../../../org.apache.harmony_vmcore_verifier/src/vmcore/src/verifier-3363/x_verifier/x_class_interface.h \
  ../../../../../../org.apache.harmony_vmcore_verifier/src/include/open/types.h \
  ../../../../../../org.apache.harmony_vmcore_verifier/src/include/open/platform_types.h \
  ../../../../../../org.apache.harmony_vmcore_verifier/src/include/open/common.h \
  ../../../../../../org.apache.harmony_vmcore_verifier/src/include/open/hycomp.h \
  ../../../../../../org.apache.harmony_vmcore_verifier/src/vmcore/src/verifier-3363/x_verifier/x_verifier.h \
  ../../../../../../org.apache.harmony_vmcore_verifier/src/vmcore/include/verifier.h \
  ../../../../../../org.eclipse.hyades.probekit/src-native/BCI/JClass/JClassBuilder.h \
  ../../../../../../org.eclipse.hyades.probekit/src-native/BCI/Common/CommonDef.h \
  ../../../../../../org.eclipse.hyades.probekit/src-native/BCI/Common/JavaHelpers.h \
  ../../../../../../org.eclipse.hyades.probekit/src-native/BCI/Common/JavaDef.h \
  ../../../../../../org.eclipse.hyades.probekit/src-native/BCI/JClass/JClassFile.h \
  ../../../../../../org.eclipse.hyades.probekit/src-native/BCI/JClass/JStream.h \
  ../../../../../../org.eclipse.hyades.probekit/src-native/BCI/JClass/JBaseStream.h \
  ../../../../../../org.eclipse.hyades.probekit/src-native/BCI/BCIEng/Module.h \
  ../../../../../../org.eclipse.hyades.probekit/src-native/BCI/BCIEng/InsSet.h \
  ../../../../../../org.eclipse.hyades.probekit/src-native/BCI/BCIEng/BCIEngJ/JVMInsSet.h \
  ../../../../../../org.eclipse.hyades.probekit/src-native/BCI/BCIEng/BCIEngJ/JVMIns.def
	$(CPP_COMPILE)

$(OBJDIR)/MethodInstrumentor.o: MethodInstrumentor.cpp MethodInstrumentor.h \
  ../../../../include/Martini/MRTETypes.h FlowGraph.h \
  ../../Include/MList.h ../../../../include/Martini/MRTEResults.h \
  ../../../../include/Martini/MIterator.h ../../Include/MHash.h \

  MIEInstructionFactory.h
	$(CPP_COMPILE)

$(OBJDIR)/MIEInstruction.o: MIEInstruction.cpp MIEInstruction.h \
  ../../../../include/Martini/MieAPI.h \
  ../../../../include/Martini/MRTEResults.h \
  ../../../../include/Martini/MRTETypes.h \

  FlowGraphNode.h ../Include/ValidityChecks.h MIEInstructionFactory.h
	$(CPP_COMPILE)

$(OBJDIR)/MIEInstructionFactory.o: MIEInstructionFactory.cpp \
  MIEInstructionFactory.h MIEInstruction.h \
  ../../../../include/Martini/MieAPI.h \
  ../../../../include/Martini/MRTEResults.h \

  FlowGraphNode.h ../Include/MIEInsFactoryMap.def
	$(CPP_COMPILE)

$(OBJDIR)/MIEProtectedBlock.o: MIEProtectedBlock.cpp MIEProtectedBlock.h \
  ../../../../include/Martini/MieAPI.h \
  ../../../../include/Martini/MRTEResults.h \
  ../../../../include/Martini/MRTETypes.h \

$(OBJDIR)/ModuleJ.o:  \
 ../../../../../../org.eclipse.hyades.probekit/src-native/BCI/BCIEng/BCIEngJ/ModuleJ.cpp \
  ../../../../../../org.eclipse.hyades.probekit/src-native/BCI/BCIEng/BCIEngJ/ModuleJ.h \
  ../../../../../../org.eclipse.hyades.probekit/src-native/BCI/BCIEng/BCIEngJ/class_inerface_int.h \
  ../../../../../../org.apache.harmony_vmcore_verifier/src/vmcore/src/verifier-3363/x_verifier/x_class_interface.h \
  ../../../../../../org.apache.harmony_vmcore_verifier/src/include/open/types.h \
  ../../../../../../org.apache.harmony_vmcore_verifier/src/include/open/platform_types.h \
  ../../../../../../org.apache.harmony_vmcore_verifier/src/include/open/common.h \
  ../../../../../../org.apache.harmony_vmcore_verifier/src/include/open/hycomp.h \
  ../../../../../../org.apache.harmony_vmcore_verifier/src/vmcore/src/verifier-3363/x_verifier/x_verifier.h \
  ../../../../../../org.apache.harmony_vmcore_verifier/src/vmcore/include/verifier.h \
  ../../../../../../org.eclipse.hyades.probekit/src-native/BCI/JClass/JClassBuilder.h \
  ../../../../../../org.eclipse.hyades.probekit/src-native/BCI/Common/CommonDef.h \
  ../../../../../../org.eclipse.hyades.probekit/src-native/BCI/Common/JavaHelpers.h \
  ../../../../../../org.eclipse.hyades.probekit/src-native/BCI/Common/JavaDef.h \
  ../../../../../../org.eclipse.hyades.probekit/src-native/BCI/JClass/JClassFile.h \
  ../../../../../../org.eclipse.hyades.probekit/src-native/BCI/JClass/JStream.h \
  ../../../../../../org.eclipse.hyades.probekit/src-native/BCI/JClass/JBaseStream.h \
  ../../../../../../org.eclipse.hyades.probekit/src-native/BCI/BCIEng/Module.h \
  ../../../../../../org.eclipse.hyades.probekit/src-native/BCI/BCIEng/InsSet.h \
  ../../../../../../org.eclipse.hyades.probekit/src-native/BCI/BCIEng/BCIEngJ/JVMInsSet.h \
  ../../../../../../org.eclipse.hyades.probekit/src-native/BCI/JClass/JFileStream.h
	$(CPP_COMPILE)

$(OBJDIR)/WideStringUtils.o: ../common/WideStringUtils.cpp \
  ../Include/WideStringUtils.h ../../../../include/Martini/MpiAPI.h \
  ../../../../include/Martini/MRTEResults.h \
  ../../../../include/Martini/MRTETypes.h \
  ../../../../include/Martini/MRTEResults.h \
  ../../../../include/Martini/MieAPI.h \
  ../../../../include/Martini/MIterator.h \
  ../../../../include/Martini/PsuedoMnemonics \
  ../../../../include/Martini/MieSpecialMnemonics \
  ../../../../include/Martini/MpiBase.h
	$(CPP_COMPILE)



Lines 14-23 Link Here

(-)src-native/src/Martini/Infrastructure/JIE/JavaMethod.h (-1 / +1 lines)
14	#ifndef MRTE_JAVAMETHOD	14	#ifndef MRTE_JAVAMETHOD
15	#define MRTE_JAVAMETHOD	15	#define MRTE_JAVAMETHOD
16		16
		17	#include "JavaClass.h"
17	#include "JIE.h"	18	#include "JIE.h"
18	#include "ModuleJ.h"	19	#include "ModuleJ.h"
19	#include "MethodInstrumentor.h"	20	#include "MethodInstrumentor.h"
20	#include "JavaClass.h"
21		21
22	namespace Martini { namespace JIE {	22	namespace Martini { namespace JIE {
23		23

Lines 15-26 Link Here

(-)src-native/src/Martini/Infrastructure/JIE/JIEInstructionCodec.h (-1 / +2 lines)
15	#ifndef MRTE_JIEINSTRUCTIONCODEC	15	#ifndef MRTE_JIEINSTRUCTIONCODEC
16	#define MRTE_JIEINSTRUCTIONCODEC	16	#define MRTE_JIEINSTRUCTIONCODEC
17		17
		18	#include "ModuleJ.h"
		19
18	#include "MIEInstructionCodec.h"	20	#include "MIEInstructionCodec.h"
19	#include "BCIToMIEInstructionMapper.h"	21	#include "BCIToMIEInstructionMapper.h"
20	#include "MIEProtectedBlock.h"	22	#include "MIEProtectedBlock.h"
21	#include "MList.h"	23	#include "MList.h"
22		24
23	#include "ModuleJ.h"
24		25
25	//	26	//
26	// The following macros are used to map a 'Treturn' instruction to its relevant	27	// The following macros are used to map a 'Treturn' instruction to its relevant

Lines 40-45 Link Here

(-)src-native/src/Martini/Infrastructure/JIE/JavaClass.cpp (+33 lines)
40	//////////////////////////////////////////////////////////////////////////	40	//////////////////////////////////////////////////////////////////////////
41	// class CJavaClass implementation	41	// class CJavaClass implementation
42		42
		43	static void* g_pJniEnv = NULL;
		44
		45	static void *
		46	get_vm_pointer(void **pJniEnv)
		47	{
		48	*pJniEnv = g_pJniEnv;
		49	return g_pJniEnv;
		50	}
		51
43	// constructs a CJavaClass object	52	// constructs a CJavaClass object
44	CJavaClass::CJavaClass(const unsigned char *pubClassFile, unsigned int uiClassSize)	53	CJavaClass::CJavaClass(const unsigned char *pubClassFile, unsigned int uiClassSize)
45	: m_pStaticInitializer(NULL), m_bModuleParsed(false), m_bMethodListCreated(false),	54	: m_pStaticInitializer(NULL), m_bModuleParsed(false), m_bMethodListCreated(false),
Lines 50-55 Link Here
50	//_CrtSetBreakAlloc(2189);	59	//_CrtSetBreakAlloc(2189);
51	#endif	60	#endif
52		61
		62	if (CJieGlobals::Instance()->isStackMapCalcEnabled)
		63	{
		64	TResult res = CJieGlobals::Instance()->pfnJPI_AttachCurrentThread(
		65	&m_pJniEnv, &m_isThreadAttached);
		66	if (MRTE_SUCCEEDED(res))
		67	{
		68	g_pJniEnv = m_pJniEnv;
		69	initialize_dynamic(get_vm_pointer);
		70	}
		71	else
		72	{
		73	CJieGlobals::Instance()->isStackMapCalcEnabled = false;
		74	m_isThreadAttached = false;
		75	m_pJniEnv = NULL;
		76	}
		77	}
		78
53	CJMemStream memStream; // Memory stream	79	CJMemStream memStream; // Memory stream
54	CJStream jsIn(&memStream); // Java input stream	80	CJStream jsIn(&memStream); // Java input stream
55	// read class file	81	// read class file
Lines 62-67 Link Here
62	// is deleted.	88	// is deleted.
63	m_pModule->Open(m_pClassBuilder, true);	89	m_pModule->Open(m_pClassBuilder, true);
64	m_pModule->SetAccessFlags(m_pClassBuilder->GetAccessFlags());	90	m_pModule->SetAccessFlags(m_pClassBuilder->GetAccessFlags());
		91	m_pModule->UseStackMapCalculation(CJieGlobals::Instance()->isStackMapCalcEnabled);
65	}	92	}
66		93
67	// destructor	94	// destructor
Lines 100-105 Link Here
100	// deallocate the instruction factory	127	// deallocate the instruction factory
101	CMIEInstructionFactory::Free();	128	CMIEInstructionFactory::Free();
102		129
		130	// detach the current thread from the JVM (if needed)
		131	if (CJieGlobals::Instance()->isStackMapCalcEnabled && m_isThreadAttached)
		132	{
		133	CJieGlobals::Instance()->pfnJPI_DetachCurrentThread();
		134	}
		135
103	// deallocate the JavaClass object	136	// deallocate the JavaClass object
104	delete this;	137	delete this;
105	}	138	}

Lines 8-17 Link Here

(-)src-native/src/Martini/Infrastructure/JIE/Makefile (-3 / +8 lines)
8	-I ../../../../../../org.eclipse.hyades.probekit/src-native/BCI/BCIEng \	8	-I ../../../../../../org.eclipse.hyades.probekit/src-native/BCI/BCIEng \
9	-I ../../../../../../org.eclipse.hyades.probekit/src-native/BCI/BCIEng/BCIEngJ \	9	-I ../../../../../../org.eclipse.hyades.probekit/src-native/BCI/BCIEng/BCIEngJ \
10	-I ../../../../../../org.eclipse.hyades.probekit/src-native/BCI/JClass \	10	-I ../../../../../../org.eclipse.hyades.probekit/src-native/BCI/JClass \
11	-I $(ROOTDIR)/src/Lin/unix	11	-I ../../../../../../org.apache.harmony_vmcore_verifier/src/include \
		12	-I ../../../../../../org.apache.harmony_vmcore_verifier/src/vmcore/include \
		13	-I ../../../../../../org.apache.harmony_vmcore_verifier/src/vmcore/src/verifier-3363/x_verifier
12		14
13	OBJS = $(OBJDIR)/BCIToMIEInstructionMapper.o \	15	OBJS = $(OBJDIR)/BCIToMIEInstructionMapper.o \
14	$(OBJDIR)/BciUtils.o \	16	$(OBJDIR)/BciUtils.o \
		17	$(OBJDIR)/class_interface.o \
15	$(OBJDIR)/Command.o \	18	$(OBJDIR)/Command.o \
16	$(OBJDIR)/ExtRefJ_Interface.o \	19	$(OBJDIR)/ExtRefJ_Interface.o \
17	$(OBJDIR)/ExtRefJ_StatMethod.o \	20	$(OBJDIR)/ExtRefJ_StatMethod.o \
Lines 41-46 Link Here
41	$(OBJDIR)/ModuleJ.o \	44	$(OBJDIR)/ModuleJ.o \
42	$(OBJDIR)/WideStringUtils.o \	45	$(OBJDIR)/WideStringUtils.o \
43		46
		47	DEFINES += -DSTATIC_BUILD -DLINUX -DPLATFORM_POSIX
44		48
45	LIB = libJIE.so	49	LIB = libJIE.so
46		50
Lines 59-63 Link Here
59	include ./Makefile.dep	63	include ./Makefile.dep
60		64
61	$(OUTDIR)/$(LIB): $(OBJS)	65	$(OUTDIR)/$(LIB): $(OBJS)
62	$(CPP_LINK) $(OBJS) -o $@ -L../../../../bin/linux/release/IA-32 -L$(OUTDIR) -lMartiniOSA \	66	$(CPP_LINK) $(OBJS) -o $@ -L../../../../bin/linux/$(PLATFORM_AND_MODE_NAME) -L$(OUTDIR) \
63	-lpthread -ldl $(STD_LIBS) $(VER_SCR)	67	-L ../../../../../../org.apache.harmony_vmcore_verifier/lib/linux/$(PLATFORM_AND_MODE_NAME) \
		68	-lMartiniOSA -lverifier -lpthread -ldl $(STD_LIBS) $(VER_SCR)

Lines 20-25 Link Here

(-)src-native/src/Martini/Infrastructure/JIE/JIEUtils.h (+36 lines)
20	#include "MString.h"	20	#include "MString.h"
21	#include "JavaHelpers.h"	21	#include "JavaHelpers.h"
22		22
		23	#include "jni.h"
		24
23	///////////////////////////////////////////////////////////////////////////////	25	///////////////////////////////////////////////////////////////////////////////
24	// Global constants	26	// Global constants
25		27
Lines 35-38 Link Here
35	U16 WCharToUtf8(U8 pDest, unsigned int uiDesBufferSize, const WCHAR pSource);	37	U16 WCharToUtf8(U8 pDest, unsigned int uiDesBufferSize, const WCHAR pSource);
36	U16 CharToUtf8(U8 pDest, unsigned int uiDesBufferSize, const char pSource);	38	U16 CharToUtf8(U8 pDest, unsigned int uiDesBufferSize, const char pSource);
37		39
		40	typedef TResult (TJpiAttachCurrentThread) (JNIEnv ppJNIEnv, bool bAttached);
		41	typedef void (*TJpiDetachCurrentThread) ();
		42
		43	namespace Martini { namespace JIE {
		44
		45	class CJieGlobals
		46	{
		47	public:
		48
		49	static CJieGlobals* Instance()
		50	{
		51	if (0 == s_pInstance)
		52	{
		53	s_pInstance = new CJieGlobals();
		54	}
		55	return s_pInstance;
		56	}
		57
		58	TJpiAttachCurrentThread pfnJPI_AttachCurrentThread;
		59	TJpiDetachCurrentThread pfnJPI_DetachCurrentThread;
		60
		61	bool isStackMapCalcEnabled;
		62
		63	protected:
		64	static CJieGlobals* s_pInstance;
		65
		66	CJieGlobals():
		67	pfnJPI_AttachCurrentThread(0), pfnJPI_DetachCurrentThread(0),
		68	isStackMapCalcEnabled(false)
		69	{}
		70
		71	};
		72	}} // namespace Martini::JIE
		73
38	#endif // MRTE_JIEUTILS	74	#endif // MRTE_JIEUTILS

Lines 221-224 Link Here

(-)src-native/src/Martini/Infrastructure/JIE/JIEUtils.cpp (+3 lines)
221	return ret;	221	return ret;
222	}	222	}
223		223
		224	//////////////////////////////////////////////////////////////////////////
		225	// CJieGlobals implementation
224		226
		227	Martini::JIE::CJieGlobals* Martini::JIE::CJieGlobals::s_pInstance = NULL;

Lines 14-21 Link Here

(-)src-native/src/Martini/Infrastructure/JIE/JavaField.h (-1 / +1 lines)
14	#ifndef MRTE_JAVAFIELD	14	#ifndef MRTE_JAVAFIELD
15	#define MRTE_JAVAFIELD	15	#define MRTE_JAVAFIELD
16		16
17	#include "JIE.h"
18	#include "JavaClass.h"	17	#include "JavaClass.h"
		18	#include "JIE.h"
19		19
20	namespace Martini { namespace JIE {	20	namespace Martini { namespace JIE {
21		21

Lines 14-25 Link Here

(-)src-native/src/Martini/Infrastructure/JIE/JavaClass.h (+10 lines)
14	#ifndef MRTE_JAVALCLASS	14	#ifndef MRTE_JAVALCLASS
15	#define MRTE_JAVALCLASS	15	#define MRTE_JAVALCLASS
16		16
		17	#include "class_inerface_int.h"
17	#include "JIE.h"	18	#include "JIE.h"
18	#include "JClassBuilder.h"	19	#include "JClassBuilder.h"
19	#include "JavaMethods.h"	20	#include "JavaMethods.h"
20	#include "JavaFields.h"	21	#include "JavaFields.h"
21	#include "ModuleJ.h"	22	#include "ModuleJ.h"
22		23
		24	#include "jni.h"
		25
23	namespace Martini { namespace JIE {	26	namespace Martini { namespace JIE {
24		27
25	class CJavaClass : public IJavaClass	28	class CJavaClass : public IJavaClass
Lines 108-113 Link Here
108	// create a new field	111	// create a new field
109	IJavaField* InternalAddField(u2 uiFlags, const char *szName, CJavaType fieldType);	112	IJavaField* InternalAddField(u2 uiFlags, const char *szName, CJavaType fieldType);
110		113
		114	// JNI environment pointer for Java 6 StackMap calculation
		115	JNIEnv* m_pJniEnv;
		116
		117	// Whether the current thread was actively attached to the JVM during instantiation of
		118	// this class
		119	bool m_isThreadAttached;
		120
111	}; // class CJavaClass	121	}; // class CJavaClass
112		122
113	}} // namespace JIE	123	}} // namespace JIE




 *****************************************************************************/
#pragma warning (disable:4786)

#include "JIEImpl.h"
#include "JavaClass.h"
#include "JIEImpl.h"
#include "JIEUtils.h"

#include "LibraryLoader.h"
#include "OSA.h"

// first ids are reserved for threads in the prf resolution
#define JIE_FIRST_METHOD_ID 0x10000 

using namespace Martini::JIE;
using namespace Martini::OSA;

extern "C" JIE_API IJIE *GetJIEInstance()
{

    return (IJIE*)&s_jie;
}


//////////////////////////////////////////////////////////////////////////
// class CJIE implementation


    }
    return pClass; 
}

void CJIE::EnableStackMapCalculation() const
{
    TResult res = BindJpiFunctions();
    if (MRTE_SUCCEEDED(res))
    {
        CJieGlobals::Instance()->isStackMapCalcEnabled = true;
    }
}

TResult CJIE::BindJpiFunctions() const
{
    ILibraryLoader *pJpiLoader = LoadBistroLibrary("JPI");
    if (!pJpiLoader)
    {
        return MRTE_ERROR_FAIL;
    }

    CJieGlobals::Instance()->pfnJPI_AttachCurrentThread = 
        (TJpiAttachCurrentThread)pJpiLoader->GetEntry("JPI_AttachCurrentThread");
    if (!CJieGlobals::Instance()->pfnJPI_AttachCurrentThread)
    {
        return MRTE_ERROR_FAIL;
    }

    CJieGlobals::Instance()->pfnJPI_DetachCurrentThread = 
        (TJpiDetachCurrentThread)pJpiLoader->GetEntry("JPI_DetachCurrentThread");
    if (!CJieGlobals::Instance()->pfnJPI_DetachCurrentThread)
    {
        return MRTE_ERROR_FAIL;
    }
    
    pJpiLoader->Destroy();

    return MRTE_RESULT_OK;
}

Lines 27-33 Link Here

(-)src-native/src/Martini/Infrastructure/JIE/JIE.dep (-5 / +111 lines)
27		27
28	.\BciUtils.cpp : \	28	.\BciUtils.cpp : \
29	"..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\bci\common\commondef.h"\	29	"..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\bci\common\commondef.h"\
30	"..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\bci\jclass\javadef.h"\	30	"..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\bci\common\javadef.h"\
31	"..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\bci\jclass\jbasestream.h"\	31	"..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\bci\jclass\jbasestream.h"\
32	"..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\bci\jclass\jclassfile.h"\	32	"..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\bci\jclass\jclassfile.h"\
33	"..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\bci\jclass\jstream.h"\	33	"..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\bci\jclass\jstream.h"\
Lines 35-40 Link Here
35	"..\..\..\..\include\martini\mieapi.h"\	35	"..\..\..\..\include\martini\mieapi.h"\
36	"..\..\..\..\include\martini\miespecialmnemonics"\	36	"..\..\..\..\include\martini\miespecialmnemonics"\
37	"..\..\..\..\include\martini\miterator.h"\	37	"..\..\..\..\include\martini\miterator.h"\
		38	"..\..\..\..\include\Martini\MpiAPI.h"\
		39	"..\..\..\..\include\martini\mpibase.h"\
38	"..\..\..\..\include\martini\mrteresults.h"\	40	"..\..\..\..\include\martini\mrteresults.h"\
39	"..\..\..\..\include\martini\mrtetypes.h"\	41	"..\..\..\..\include\martini\mrtetypes.h"\
40	"..\..\..\..\include\martini\psuedomnemonics"\	42	"..\..\..\..\include\martini\psuedomnemonics"\
Lines 42-53 Link Here
42	".\BciUtils.h"\	44	".\BciUtils.h"\
43		45
44		46
		47	"..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\BCI\BCIEng\BCIEngJ\class_interface.cpp" : \
		48	"..\..\..\..\..\..\org.apache.harmony_vmcore_verifier\src\include\jni.h"\
		49	"..\..\..\..\..\..\org.apache.harmony_vmcore_verifier\src\include\jni_types.h"\
		50	"..\..\..\..\..\..\org.apache.harmony_vmcore_verifier\src\include\open\common.h"\
		51	"..\..\..\..\..\..\org.apache.harmony_vmcore_verifier\src\include\open\hycomp.h"\
		52	"..\..\..\..\..\..\org.apache.harmony_vmcore_verifier\src\include\open\platform_types.h"\
		53	"..\..\..\..\..\..\org.apache.harmony_vmcore_verifier\src\vmcore\include\verifier.h"\
		54	"..\..\..\..\..\..\org.apache.harmony_vmcore_verifier\src\vmcore\src\verifier-3363\x_verifier\x_class_interface.h"\
		55	"..\..\..\..\..\..\org.apache.harmony_vmcore_verifier\src\vmcore\src\verifier-3363\x_verifier\x_verifier.h"\
		56	"..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\bci\bcieng\bcieng.h"\
		57	"..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\bci\bcieng\bciengj\class_inerface_int.h"\
		58	"..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\bci\bcieng\bciengj\modulej.h"\
		59	"..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\bci\bcieng\insset.h"\
		60	"..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\bci\bcieng\module.h"\
		61	"..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\bci\common\commondef.h"\
		62	"..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\bci\common\javadef.h"\
		63	"..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\bci\common\javahelpers.h"\
		64	"..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\bci\jclass\jbasestream.h"\
		65	"..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\bci\jclass\jclassbuilder.h"\
		66	"..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\bci\jclass\jclassfile.h"\
		67	"..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\bci\jclass\jmemstream.h"\
		68	"..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\bci\jclass\jstream.h"\
		69
45	"..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\BCI\Common\Command.cpp" : \	70	"..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\BCI\Common\Command.cpp" : \
46	"..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\bci\common\command.h"\	71	"..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\bci\common\command.h"\
47	"..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\bci\common\commondef.h"\	72	"..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\bci\common\commondef.h"\
48		73
49		74
50	"..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\BCI\BCIEng\BCIEngJ\ExtRefJ_Interface.cpp" : \	75	"..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\BCI\BCIEng\BCIEngJ\ExtRefJ_Interface.cpp" : \
		76	"..\..\..\..\..\..\org.apache.harmony_vmcore_verifier\src\include\open\common.h"\
		77	"..\..\..\..\..\..\org.apache.harmony_vmcore_verifier\src\include\open\hycomp.h"\
		78	"..\..\..\..\..\..\org.apache.harmony_vmcore_verifier\src\include\open\platform_types.h"\
		79	"..\..\..\..\..\..\org.apache.harmony_vmcore_verifier\src\vmcore\include\verifier.h"\
		80	"..\..\..\..\..\..\org.apache.harmony_vmcore_verifier\src\vmcore\src\verifier-3363\x_verifier\x_class_interface.h"\
		81	"..\..\..\..\..\..\org.apache.harmony_vmcore_verifier\src\vmcore\src\verifier-3363\x_verifier\x_verifier.h"\
		82	"..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\bci\bcieng\bciengj\class_inerface_int.h"\
51	"..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\bci\bcieng\bciengj\extrefj_interface.h"\	83	"..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\bci\bcieng\bciengj\extrefj_interface.h"\
52	"..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\bci\bcieng\bciengj\modulej.h"\	84	"..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\bci\bcieng\bciengj\modulej.h"\
53	"..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\bci\bcieng\insset.h"\	85	"..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\bci\bcieng\insset.h"\
Lines 62-67 Link Here
62		94
63		95
64	"..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\BCI\BCIEng\BCIEngJ\ExtRefJ_StatMethod.cpp" : \	96	"..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\BCI\BCIEng\BCIEngJ\ExtRefJ_StatMethod.cpp" : \
		97	"..\..\..\..\..\..\org.apache.harmony_vmcore_verifier\src\include\open\common.h"\
		98	"..\..\..\..\..\..\org.apache.harmony_vmcore_verifier\src\include\open\hycomp.h"\
		99	"..\..\..\..\..\..\org.apache.harmony_vmcore_verifier\src\include\open\platform_types.h"\
		100	"..\..\..\..\..\..\org.apache.harmony_vmcore_verifier\src\vmcore\include\verifier.h"\
		101	"..\..\..\..\..\..\org.apache.harmony_vmcore_verifier\src\vmcore\src\verifier-3363\x_verifier\x_class_interface.h"\
		102	"..\..\..\..\..\..\org.apache.harmony_vmcore_verifier\src\vmcore\src\verifier-3363\x_verifier\x_verifier.h"\
		103	"..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\bci\bcieng\bciengj\class_inerface_int.h"\
65	"..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\bci\bcieng\bciengj\extrefj_statmethod.h"\	104	"..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\bci\bcieng\bciengj\extrefj_statmethod.h"\
66	"..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\bci\bcieng\bciengj\modulej.h"\	105	"..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\bci\bcieng\bciengj\modulej.h"\
67	"..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\bci\bcieng\insset.h"\	106	"..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\bci\bcieng\insset.h"\
Lines 114-119 Link Here
114		153
115		154
116	.\JavaClass.cpp : \	155	.\JavaClass.cpp : \
		156	"..\..\..\..\..\..\org.apache.harmony_vmcore_verifier\src\include\jni.h"\
		157	"..\..\..\..\..\..\org.apache.harmony_vmcore_verifier\src\include\jni_types.h"\
		158	"..\..\..\..\..\..\org.apache.harmony_vmcore_verifier\src\include\open\common.h"\
		159	"..\..\..\..\..\..\org.apache.harmony_vmcore_verifier\src\include\open\hycomp.h"\
		160	"..\..\..\..\..\..\org.apache.harmony_vmcore_verifier\src\include\open\platform_types.h"\
		161	"..\..\..\..\..\..\org.apache.harmony_vmcore_verifier\src\vmcore\include\verifier.h"\
		162	"..\..\..\..\..\..\org.apache.harmony_vmcore_verifier\src\vmcore\src\verifier-3363\x_verifier\x_class_interface.h"\
		163	"..\..\..\..\..\..\org.apache.harmony_vmcore_verifier\src\vmcore\src\verifier-3363\x_verifier\x_verifier.h"\
		164	"..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\bci\bcieng\bciengj\class_inerface_int.h"\
117	"..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\bci\bcieng\bciengj\jvminsset.h"\	165	"..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\bci\bcieng\bciengj\jvminsset.h"\
118	"..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\bci\bcieng\bciengj\modulej.h"\	166	"..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\bci\bcieng\bciengj\modulej.h"\
119	"..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\bci\bcieng\insset.h"\	167	"..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\bci\bcieng\insset.h"\
Lines 157-162 Link Here
157		205
158		206
159	.\JavaField.cpp : \	207	.\JavaField.cpp : \
		208	"..\..\..\..\..\..\org.apache.harmony_vmcore_verifier\src\include\jni.h"\
		209	"..\..\..\..\..\..\org.apache.harmony_vmcore_verifier\src\include\jni_types.h"\
		210	"..\..\..\..\..\..\org.apache.harmony_vmcore_verifier\src\include\open\common.h"\
		211	"..\..\..\..\..\..\org.apache.harmony_vmcore_verifier\src\include\open\hycomp.h"\
		212	"..\..\..\..\..\..\org.apache.harmony_vmcore_verifier\src\include\open\platform_types.h"\
		213	"..\..\..\..\..\..\org.apache.harmony_vmcore_verifier\src\vmcore\include\verifier.h"\
		214	"..\..\..\..\..\..\org.apache.harmony_vmcore_verifier\src\vmcore\src\verifier-3363\x_verifier\x_class_interface.h"\
		215	"..\..\..\..\..\..\org.apache.harmony_vmcore_verifier\src\vmcore\src\verifier-3363\x_verifier\x_verifier.h"\
		216	"..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\bci\bcieng\bciengj\class_inerface_int.h"\
160	"..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\bci\bcieng\bciengj\modulej.h"\	217	"..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\bci\bcieng\bciengj\modulej.h"\
161	"..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\bci\bcieng\insset.h"\	218	"..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\bci\bcieng\insset.h"\
162	"..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\bci\bcieng\module.h"\	219	"..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\bci\bcieng\module.h"\
Lines 171-176 Link Here
171	"..\..\..\..\include\martini\mieapi.h"\	228	"..\..\..\..\include\martini\mieapi.h"\
172	"..\..\..\..\include\martini\miespecialmnemonics"\	229	"..\..\..\..\include\martini\miespecialmnemonics"\
173	"..\..\..\..\include\martini\miterator.h"\	230	"..\..\..\..\include\martini\miterator.h"\
		231	"..\..\..\..\include\Martini\MpiAPI.h"\
		232	"..\..\..\..\include\martini\mpibase.h"\
174	"..\..\..\..\include\martini\mrteresults.h"\	233	"..\..\..\..\include\martini\mrteresults.h"\
175	"..\..\..\..\include\martini\mrtetypes.h"\	234	"..\..\..\..\include\martini\mrtetypes.h"\
176	"..\..\..\..\include\Martini\OSA.h"\	235	"..\..\..\..\include\Martini\OSA.h"\
Lines 206-211 Link Here
206		265
207		266
208	.\JavaMethod.cpp : \	267	.\JavaMethod.cpp : \
		268	"..\..\..\..\..\..\org.apache.harmony_vmcore_verifier\src\include\jni.h"\
		269	"..\..\..\..\..\..\org.apache.harmony_vmcore_verifier\src\include\jni_types.h"\
		270	"..\..\..\..\..\..\org.apache.harmony_vmcore_verifier\src\include\open\common.h"\
		271	"..\..\..\..\..\..\org.apache.harmony_vmcore_verifier\src\include\open\hycomp.h"\
		272	"..\..\..\..\..\..\org.apache.harmony_vmcore_verifier\src\include\open\platform_types.h"\
		273	"..\..\..\..\..\..\org.apache.harmony_vmcore_verifier\src\vmcore\include\verifier.h"\
		274	"..\..\..\..\..\..\org.apache.harmony_vmcore_verifier\src\vmcore\src\verifier-3363\x_verifier\x_class_interface.h"\
		275	"..\..\..\..\..\..\org.apache.harmony_vmcore_verifier\src\vmcore\src\verifier-3363\x_verifier\x_verifier.h"\
		276	"..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\bci\bcieng\bciengj\class_inerface_int.h"\
209	"..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\bci\bcieng\bciengj\modulej.h"\	277	"..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\bci\bcieng\bciengj\modulej.h"\
210	"..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\bci\bcieng\insset.h"\	278	"..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\bci\bcieng\insset.h"\
211	"..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\bci\bcieng\module.h"\	279	"..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\bci\bcieng\module.h"\
Lines 273-292 Link Here
273		341
274	"..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\BCI\JClass\JClassFile.cpp" : \	342	"..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\BCI\JClass\JClassFile.cpp" : \
275	"..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\bci\common\commondef.h"\	343	"..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\bci\common\commondef.h"\
276	"..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\bci\jclass\javadef.h"\	344	"..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\bci\common\javadef.h"\
277	"..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\bci\jclass\jbasestream.h"\	345	"..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\bci\jclass\jbasestream.h"\
278	"..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\bci\jclass\jclassfile.h"\	346	"..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\bci\jclass\jclassfile.h"\
		347	"..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\bci\jclass\jmemstream.h"\
279	"..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\bci\jclass\jstream.h"\	348	"..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\bci\jclass\jstream.h"\
280		349
281		350
282	"..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\BCI\JClass\JFileStream.cpp" : \	351	"..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\BCI\JClass\JFileStream.cpp" : \
283	"..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\bci\common\commondef.h"\	352	"..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\bci\common\commondef.h"\
284	"..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\bci\jclass\javadef.h"\	353	"..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\bci\common\javadef.h"\
285	"..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\bci\jclass\jbasestream.h"\	354	"..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\bci\jclass\jbasestream.h"\
286	"..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\bci\jclass\jfilestream.h"\	355	"..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\bci\jclass\jfilestream.h"\
287		356
288		357
289	.\JIE.cpp : \	358	.\JIE.cpp : \
		359	"..\..\..\..\..\..\org.apache.harmony_vmcore_verifier\src\include\jni.h"\
		360	"..\..\..\..\..\..\org.apache.harmony_vmcore_verifier\src\include\jni_types.h"\
		361	"..\..\..\..\..\..\org.apache.harmony_vmcore_verifier\src\include\open\common.h"\
		362	"..\..\..\..\..\..\org.apache.harmony_vmcore_verifier\src\include\open\hycomp.h"\
		363	"..\..\..\..\..\..\org.apache.harmony_vmcore_verifier\src\include\open\platform_types.h"\
		364	"..\..\..\..\..\..\org.apache.harmony_vmcore_verifier\src\vmcore\include\verifier.h"\
		365	"..\..\..\..\..\..\org.apache.harmony_vmcore_verifier\src\vmcore\src\verifier-3363\x_verifier\x_class_interface.h"\
		366	"..\..\..\..\..\..\org.apache.harmony_vmcore_verifier\src\vmcore\src\verifier-3363\x_verifier\x_verifier.h"\
		367	"..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\bci\bcieng\bciengj\class_inerface_int.h"\
290	"..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\bci\bcieng\bciengj\modulej.h"\	368	"..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\bci\bcieng\bciengj\modulej.h"\
291	"..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\bci\bcieng\insset.h"\	369	"..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\bci\bcieng\insset.h"\
292	"..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\bci\bcieng\module.h"\	370	"..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\bci\bcieng\module.h"\
Lines 306-319 Link Here
306	"..\..\..\..\include\Martini\OSA.h"\	384	"..\..\..\..\include\Martini\OSA.h"\
307	"..\..\..\..\include\martini\psuedomnemonics"\	385	"..\..\..\..\include\martini\psuedomnemonics"\
308	"..\..\Include\JIE.h"\	386	"..\..\Include\JIE.h"\
		387	"..\..\include\libraryloader.h"\
309	"..\..\include\mlist.h"\	388	"..\..\include\mlist.h"\
		389	"..\..\include\mstring.h"\
310	".\JavaClass.h"\	390	".\JavaClass.h"\
311	".\JavaFields.h"\	391	".\JavaFields.h"\
312	".\JavaMethods.h"\	392	".\JavaMethods.h"\
313	".\JIEImpl.h"\	393	".\JIEImpl.h"\
		394	".\JIEUtils.h"\
314		395
315		396
316	.\JIEInstructionCodec.cpp : \	397	.\JIEInstructionCodec.cpp : \
		398	"..\..\..\..\..\..\org.apache.harmony_vmcore_verifier\src\include\open\common.h"\
		399	"..\..\..\..\..\..\org.apache.harmony_vmcore_verifier\src\include\open\hycomp.h"\
		400	"..\..\..\..\..\..\org.apache.harmony_vmcore_verifier\src\include\open\platform_types.h"\
		401	"..\..\..\..\..\..\org.apache.harmony_vmcore_verifier\src\vmcore\include\verifier.h"\
		402	"..\..\..\..\..\..\org.apache.harmony_vmcore_verifier\src\vmcore\src\verifier-3363\x_verifier\x_class_interface.h"\
		403	"..\..\..\..\..\..\org.apache.harmony_vmcore_verifier\src\vmcore\src\verifier-3363\x_verifier\x_verifier.h"\
		404	"..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\bci\bcieng\bciengj\class_inerface_int.h"\
317	"..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\bci\bcieng\bciengj\modulej.h"\	405	"..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\bci\bcieng\bciengj\modulej.h"\
318	"..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\bci\bcieng\insset.h"\	406	"..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\bci\bcieng\insset.h"\
319	"..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\bci\bcieng\module.h"\	407	"..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\bci\bcieng\module.h"\
Lines 351-356 Link Here
351		439
352		440
353	.\JIEUtils.cpp : \	441	.\JIEUtils.cpp : \
		442	"..\..\..\..\..\..\org.apache.harmony_vmcore_verifier\src\include\jni.h"\
		443	"..\..\..\..\..\..\org.apache.harmony_vmcore_verifier\src\include\jni_types.h"\
354	"..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\bci\common\commondef.h"\	444	"..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\bci\common\commondef.h"\
355	"..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\bci\common\javadef.h"\	445	"..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\bci\common\javadef.h"\
356	"..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\bci\common\javahelpers.h"\	446	"..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\bci\common\javahelpers.h"\
Lines 372-390 Link Here
372		462
373	"..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\BCI\JClass\JMemStream.cpp" : \	463	"..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\BCI\JClass\JMemStream.cpp" : \
374	"..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\bci\common\commondef.h"\	464	"..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\bci\common\commondef.h"\
375	"..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\bci\jclass\javadef.h"\	465	"..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\bci\common\javadef.h"\
376	"..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\bci\jclass\jbasestream.h"\	466	"..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\bci\jclass\jbasestream.h"\
377	"..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\bci\jclass\jmemstream.h"\	467	"..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\bci\jclass\jmemstream.h"\
378		468
379		469
380	"..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\BCI\JClass\JStream.cpp" : \	470	"..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\BCI\JClass\JStream.cpp" : \
381	"..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\bci\common\commondef.h"\	471	"..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\bci\common\commondef.h"\
382	"..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\bci\jclass\javadef.h"\	472	"..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\bci\common\javadef.h"\
383	"..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\bci\jclass\jbasestream.h"\	473	"..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\bci\jclass\jbasestream.h"\
384	"..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\bci\jclass\jstream.h"\	474	"..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\bci\jclass\jstream.h"\
385		475
386		476
387	"..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\BCI\BCIEng\BCIEngJ\JVMInsSet.cpp" : \	477	"..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\BCI\BCIEng\BCIEngJ\JVMInsSet.cpp" : \
		478	"..\..\..\..\..\..\org.apache.harmony_vmcore_verifier\src\include\open\common.h"\
		479	"..\..\..\..\..\..\org.apache.harmony_vmcore_verifier\src\include\open\hycomp.h"\
		480	"..\..\..\..\..\..\org.apache.harmony_vmcore_verifier\src\include\open\platform_types.h"\
		481	"..\..\..\..\..\..\org.apache.harmony_vmcore_verifier\src\vmcore\include\verifier.h"\
		482	"..\..\..\..\..\..\org.apache.harmony_vmcore_verifier\src\vmcore\src\verifier-3363\x_verifier\x_class_interface.h"\
		483	"..\..\..\..\..\..\org.apache.harmony_vmcore_verifier\src\vmcore\src\verifier-3363\x_verifier\x_verifier.h"\
		484	"..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\bci\bcieng\bciengj\class_inerface_int.h"\
388	"..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\bci\bcieng\bciengj\jvmins.def"\	485	"..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\bci\bcieng\bciengj\jvmins.def"\
389	"..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\bci\bcieng\bciengj\jvminsset.h"\	486	"..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\bci\bcieng\bciengj\jvminsset.h"\
390	"..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\bci\bcieng\bciengj\modulej.h"\	487	"..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\bci\bcieng\bciengj\modulej.h"\
Lines 480-485 Link Here
480		577
481		578
482	"..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\BCI\BCIEng\BCIEngJ\ModuleJ.cpp" : \	579	"..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\BCI\BCIEng\BCIEngJ\ModuleJ.cpp" : \
		580	"..\..\..\..\..\..\org.apache.harmony_vmcore_verifier\src\include\open\common.h"\
		581	"..\..\..\..\..\..\org.apache.harmony_vmcore_verifier\src\include\open\hycomp.h"\
		582	"..\..\..\..\..\..\org.apache.harmony_vmcore_verifier\src\include\open\platform_types.h"\
		583	"..\..\..\..\..\..\org.apache.harmony_vmcore_verifier\src\vmcore\include\verifier.h"\
		584	"..\..\..\..\..\..\org.apache.harmony_vmcore_verifier\src\vmcore\src\verifier-3363\x_verifier\x_class_interface.h"\
		585	"..\..\..\..\..\..\org.apache.harmony_vmcore_verifier\src\vmcore\src\verifier-3363\x_verifier\x_verifier.h"\
		586	"..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\bci\bcieng\bciengj\class_inerface_int.h"\
483	"..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\bci\bcieng\bciengj\jvminsset.h"\	587	"..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\bci\bcieng\bciengj\jvminsset.h"\
484	"..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\bci\bcieng\bciengj\modulej.h"\	588	"..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\bci\bcieng\bciengj\modulej.h"\
485	"..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\bci\bcieng\insset.h"\	589	"..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\bci\bcieng\insset.h"\
Lines 499-504 Link Here
499	"..\..\..\..\include\martini\mieapi.h"\	603	"..\..\..\..\include\martini\mieapi.h"\
500	"..\..\..\..\include\martini\miespecialmnemonics"\	604	"..\..\..\..\include\martini\miespecialmnemonics"\
501	"..\..\..\..\include\martini\miterator.h"\	605	"..\..\..\..\include\martini\miterator.h"\
		606	"..\..\..\..\include\Martini\MpiAPI.h"\
		607	"..\..\..\..\include\martini\mpibase.h"\
502	"..\..\..\..\include\martini\mrteresults.h"\	608	"..\..\..\..\include\martini\mrteresults.h"\
503	"..\..\..\..\include\martini\mrtetypes.h"\	609	"..\..\..\..\include\martini\mrtetypes.h"\
504	"..\..\..\..\include\martini\psuedomnemonics"\	610	"..\..\..\..\include\martini\psuedomnemonics"\

Lines 60-66 Link Here

(-)src-native/src/Martini/Infrastructure/Include/ThreadAdaptor.h (-1 / +2 lines)
60	// IInstrumentationAdaptor methods	60	// IInstrumentationAdaptor methods
61		61
62	virtual TResult Init(Infrastructure::ILogAssert *pLogger = NULL,	62	virtual TResult Init(Infrastructure::ILogAssert *pLogger = NULL,
63	MPI::IEventFilter *pFilter = NULL);	63	MPI::IEventFilter *pFilter = NULL,
		64	MPI::BitSet configFlags = MPI::CF_NONE);
64		65
65	virtual TResult ModifyClass(MPI::TId classId,	66	virtual TResult ModifyClass(MPI::TId classId,
66	const Infrastructure::SClassFile &classToInstrument,	67	const Infrastructure::SClassFile &classToInstrument,

Lines 109-115 Link Here

(-)src-native/src/Martini/Infrastructure/Include/MPI.h (-1 / +1 lines)
109		109
110	virtual TResult Configure(BitSet configuration, SConfigData *pConfigData)	110	virtual TResult Configure(BitSet configuration, SConfigData *pConfigData)
111	{	111	{
112	return (m_pKernel->Configure (configuration));	112	return (m_pKernel->Configure(configuration));
113	}	113	}
114		114
115	virtual TResult MessageLog(TId clientId, EMessageType msgType, BitSet msgDest,	115	virtual TResult MessageLog(TId clientId, EMessageType msgType, BitSet msgDest,

Lines 109-122 Link Here

(-)src-native/src/Martini/Infrastructure/Include/InstrumentationAdaptorBase.h (-6 / +13 lines)
109	* Implements initialization common to all adaptors. Adaptor implementations should	109	* Implements initialization common to all adaptors. Adaptor implementations should
110	* call this function during initialization.	110	* call this function during initialization.
111	*	111	*
112	* @param[in] pLogger : A pointer to an initialized Logger object, to be used	112	* @param[in] pLogger : A pointer to an initialized Logger object, to be used
113	* by the instrumentation adaptor for logging messages and	113	* by the instrumentation adaptor for logging messages and
114	* reporting fatal errors.	114	* reporting fatal errors.
		115	* @param[in] configFlags : Optional configuration flags passed to the Martini tool
		116	* during its initialization (see MPI::EConfigurationFlags)
115	*	117	*
116	* @retval MRTE_RESULT_OK Success	118	* @retval MRTE_RESULT_OK Success
117	* @retval MRTE_ERROR_FAIL Initialization error	119	* @retval MRTE_ERROR_FAIL Initialization error
118	*/	120	*/
119	TResult Init(Infrastructure::ILogAssert *pLogger = NULL);	121	TResult Init(Infrastructure::ILogAssert *pLogger = NULL,
		122	MPI::BitSet configFlags = MPI::CF_NONE);
120		123
121	/**	124	/**
122	* @brief Retrieves Java class information	125	* @brief Retrieves Java class information
Lines 188-199 Link Here
188	SAdaptorMethodInfo* GetInfoFromMethodMap(TMethodNameToInfoMap &theMap,	191	SAdaptorMethodInfo* GetInfoFromMethodMap(TMethodNameToInfoMap &theMap,
189	const JIE::SJavaMethodInfo &javaMethodInfo);	192	const JIE::SJavaMethodInfo &javaMethodInfo);
190		193
		194	// Returns true if StackMapTable attribute calculation (Java 6) is enabled
		195	bool IsStackMapCalcEnabled();
		196
191	// Common adaptor fields	197	// Common adaptor fields
192		198
193	bool m_bJVMInitDone; // Indicates whether the JVM has initialized	199	bool m_bJVMInitDone; // Indicates whether the JVM has initialized
194	JIE::IJIE* m_pJIE; // Java Instrumentation Engine instance	200	JIE::IJIE* m_pJIE; // Java Instrumentation Engine instance
195	Infrastructure::ILogAssert *m_pLogger; // Logger instance	201	Infrastructure::ILogAssert *m_pLogger; // Logger instance
196		202	MPI::BitSet m_configFlags; // Configuration flags
		203
197	private:	204	private:
198		205
199	/**	206	/**
Lines 202-208 Link Here
202	* @returns a pointer to the JIE interface, or null if JIE could not be initialized	209	* @returns a pointer to the JIE interface, or null if JIE could not be initialized
203	*/	210	*/
204	JIE::IJIE* InitJIE();	211	JIE::IJIE* InitJIE();
205		212
206	}; // class CInstrumentationAdaptorBase	213	}; // class CInstrumentationAdaptorBase
207		214
208		215

Lines 16-22 Link Here

(-)src-native/src/Martini/Infrastructure/Include/JPI.H (-1 / +1 lines)
16		16
17	#include <iostream>	17	#include <iostream>
18	#include "OSA.h"	18	#include "OSA.h"
19	#include "jvmpi.h"	19	#include "jvmti.h"
20	#include "MPI.h"	20	#include "MPI.h"
21		21
22	#ifdef JPI_EXPORTS	22	#ifdef JPI_EXPORTS

Lines 25-31 Link Here

(-)src-native/src/Martini/Infrastructure/Include/IKernel.h (-1 / +1 lines)
25	const char *szOptions) = 0;	25	const char *szOptions) = 0;
26	virtual SClientInfo *GetClientInfo(MPI::TId id) = 0;	26	virtual SClientInfo *GetClientInfo(MPI::TId id) = 0;
27	virtual SClientInfo GetClientInfo(const char szProfiler) = 0;	27	virtual SClientInfo GetClientInfo(const char szProfiler) = 0;
28	virtual TResult Configure(unsigned int configuration) = 0;	28	virtual TResult Configure(MPI::BitSet configuration) = 0;
29	virtual TResult SuspendVM() = 0;	29	virtual TResult SuspendVM() = 0;
30	virtual TResult ResumeVM() = 0;	30	virtual TResult ResumeVM() = 0;
31	virtual TResult RunGC() = 0;	31	virtual TResult RunGC() = 0;




        // IInstrumentationAdaptor methods

        virtual TResult Init(Infrastructure::ILogAssert *pLogger = NULL,
                             MPI::IEventFilter* pFilter = NULL,
                             MPI::BitSet configFlags = MPI::CF_NONE);

        virtual TResult ModifyClass(MPI::TId classId, 
                                    const Infrastructure::SClassFile &classToInstrument,

                                 MIE::TVariableID isJVMInitVar,
                                 JIE::TConstantPoolIndex cpiMethodId,
                                 JIE::TConstantPoolIndex cpiLeaveCallback,
                                 bool bJVMInitDone,
                                 bool bIsConstructor);

        // Adds a static private boolean field to the specified Java class
        // which is used to determine whether a method was called for the first time

                                                MPI::TId methodMPIId);

        bool IsProblematicMethod(const char *szClassName, const char *szMethodName);
        bool IsConstructor(const char *szMethodName);

    }; // class CCGAdaptor





         *
         * This function initializes the Instrumentation Adaptor. It is called
         * prior to any other Adaptor function.
         * 
         * @param[in] pLogger       : A pointer to an initialized Logger object, to be used
         *                            by the instrumentation adaptor for logging messages and 
         *                            reporting fatal errors.
         * @param[in] pFilter       : An optional pointer to an object implementing the
         *                            IEventFilter interface. The Adaptor uses this 
         *                            object to determine which elements of the class file
         *                            should be instrumented.
         * @param[in] configFlags   : Optional configuration flags passed to the Martini tool
         *                            during its initialization (see MPI::EConfigurationFlags)
         *
         * @retval MRTE_RESULT_OK                   Success
         * @retval MRTE_ERROR_FAIL                  Initialization error

         *                                          by the adaptor module
         */
        virtual TResult Init(Infrastructure::ILogAssert *pLogger = NULL,
                             MPI::IEventFilter* pFilter = NULL,
                             MPI::BitSet configFlags = MPI::CF_NONE) = 0;

        /**
         * @brief Modifies a Java class file

Lines 69-75 Link Here

(-)src-native/src/Martini/Infrastructure/Include/HeapAdaptor.h (-1 / +2 lines)
69	// IInstrumentationAdaptor methods	69	// IInstrumentationAdaptor methods
70		70
71	virtual TResult Init(Infrastructure::ILogAssert *pLogger = NULL,	71	virtual TResult Init(Infrastructure::ILogAssert *pLogger = NULL,
72	MPI::IEventFilter* pFilter = NULL);	72	MPI::IEventFilter* pFilter = NULL,
		73	MPI::BitSet configFlags = MPI::CF_NONE);
73		74
74	virtual TResult ModifyClass(MPI::TId classId,	75	virtual TResult ModifyClass(MPI::TId classId,
75	const Infrastructure::SClassFile &classToInstrument,	76	const Infrastructure::SClassFile &classToInstrument,

Lines 54-59 Link Here

(-)src-native/src/JPIAgent/Options.h (+5 lines)
54	unsigned int allocSites:1; /* Print allocsites information*/	54	unsigned int allocSites:1; /* Print allocsites information*/
55	enum TraceFormat format; /* Binary or XML output format*/	55	enum TraceFormat format; /* Binary or XML output format*/
56	unsigned int contAnalysis:1; /* Provide information for contention analysis*/	56	unsigned int contAnalysis:1; /* Provide information for contention analysis*/
		57	unsigned int calcStackMap:1; /* Enables recalculation of the StackMapTable attribute for Java class versions >= 50.0 */
57	enum StackInfo stackInfo; /* Stack maintenance mode (StackInfoContiguous)*/	58	enum StackInfo stackInfo; /* Stack maintenance mode (StackInfoContiguous)*/
58	char invocationOptions; / The invocation options from the command line */	59	char invocationOptions; / The invocation options from the command line */
59	char filterFileName; / Name of the filters file (filters.txt)*/	60	char filterFileName; / Name of the filters file (filters.txt)*/
Lines 159-164 Link Here
159	return m_jvmtiAgent_Options.contAnalysis == 1;	160	return m_jvmtiAgent_Options.contAnalysis == 1;
160	}	161	}
161		162
		163	// Is StackMap calculation enabled for Java class file versions >= 50.0 (Java 6)
		164	bool isCalcStackMap() {
		165	return m_jvmtiAgent_Options.calcStackMap == 1;
		166	}
162		167
163	const char* getUnknownOptionByName( const char* name );	168	const char* getUnknownOptionByName( const char* name );
164		169

Lines 70-76 Link Here

(-)src-native/src/JPIAgent/Options.cpp (-3 / +11 lines)
70	,1 /* Call graph profiler specific option.*/	70	,1 /* Call graph profiler specific option.*/
71	,0	71	,0
72	,XmlFormat /* Default output format.*/	72	,XmlFormat /* Default output format.*/
73	,0 /* */	73	,0 /* ThreadProf option: contention analysis (off) */
		74	,0 /* Global option: StackMapTable calculation (off) */
74	,StackInfoNormal /* Stack mode preference (default) */	75	,StackInfoNormal /* Stack mode preference (default) */
75	,0 /* The invocation options from the command line */	76	,0 /* The invocation options from the command line */
76	,0 /* Filter File (to be initialized) */	77	,0 /* Filter File (to be initialized) */
Lines 78-84 Link Here
78	,0 /* Default process type (to be initialized) */	79	,0 /* Default process type (to be initialized) */
79	,0 /* Default trace file name (to be initialized) */	80	,0 /* Default trace file name (to be initialized) */
80	,0 /* Default profile file name (to be initialized) */	81	,0 /* Default profile file name (to be initialized) */
81	,0 /* Defualt working dir (to be initialized) */	82	,0 /* Default working dir (to be initialized) */
82	,0 /* currently no unknown options */	83	,0 /* currently no unknown options */
83	};	84	};
84		85
Lines 137-143 Link Here
137	"\n"	138	"\n"
138	"Supported option names and values:\n"	139	"Supported option names and values:\n"
139	" server=standalone\|enabled\|controlled\n"	140	" server=standalone\|enabled\|controlled\n"
140	" api=true\|false\tWhether to enable the Profiler API (true) or not (false). Default is false.\n"	141	" api=true\|false\tWhether to enable the Profiler API or not.\n"
		142	" \t\t\tDefault is false.\n"
		143	" stackmap=true\|false\tWhether to recalculate the StackMapTable attribute of\n"
		144	" \t\t\tinstrumented methods.\n"
		145	" \t\t\tUse only when experiencing verification errors in \n"
		146	" \t\t\tJava 1.6+. Default is false.\n"
141	" file=<file>\t\tOutput file (default is %s)\n"	147	" file=<file>\t\tOutput file (default is %s)\n"
142	" \t\t\tOnly applicable when server=standalone\n"	148	" \t\t\tOnly applicable when server=standalone\n"
143	" filters=<file>\tFilter definition file (default is %s)\n"	149	" filters=<file>\tFilter definition file (default is %s)\n"
Lines 302-307 Link Here
302	m_jvmtiAgent_Options.allocSites = setBooleanOption(value, key, m_jvmtiAgent_Options.allocSites);	308	m_jvmtiAgent_Options.allocSites = setBooleanOption(value, key, m_jvmtiAgent_Options.allocSites);
303	} else if (STRICOLL(key, "CONTANALYSIS") == 0) {	309	} else if (STRICOLL(key, "CONTANALYSIS") == 0) {
304	m_jvmtiAgent_Options.contAnalysis = setBooleanOption(value, key, m_jvmtiAgent_Options.contAnalysis);	310	m_jvmtiAgent_Options.contAnalysis = setBooleanOption(value, key, m_jvmtiAgent_Options.contAnalysis);
		311	} else if (STRICOLL(key, "STACKMAP") == 0) {
		312	m_jvmtiAgent_Options.calcStackMap = setBooleanOption(value, key, m_jvmtiAgent_Options.calcStackMap);
305	} else {	313	} else {
306	/* 60879 add the unknown profiling option to the 'unknowns' list so that we	314	/* 60879 add the unknown profiling option to the 'unknowns' list so that we
307	can echo it back to the UI */	315	can echo it back to the UI */

Lines 596-601 Link Here

(-)src-native/src/JPIAgent/ECWrapper.cpp (+7 lines)
596	}	596	}
597		597
598	EC_EXPORT bool ECCALL	598	EC_EXPORT bool ECCALL
		599	isCalcStackMap(EC_Env* env)
		600	{
		601	return ECWrapper::m_pCOptions->isCalcStackMap();
		602	}
		603
		604	EC_EXPORT bool ECCALL
599	isStackMemoryFree(EC_Env* env)	605	isStackMemoryFree(EC_Env* env)
600	{	606	{
601	return ECWrapper::m_pCOptions->isStackMemoryFree();	607	return ECWrapper::m_pCOptions->isStackMemoryFree();
Lines 690-695 Link Here
690	ECWrapper::m_ECFunctions.isEnabled = &isEnabled;	696	ECWrapper::m_ECFunctions.isEnabled = &isEnabled;
691	ECWrapper::m_ECFunctions.isAllocSitesSupported = &isAllocSitesSupported;	697	ECWrapper::m_ECFunctions.isAllocSitesSupported = &isAllocSitesSupported;
692	ECWrapper::m_ECFunctions.isContentionAnalysisSupported = &isContentionAnalysisSupported;	698	ECWrapper::m_ECFunctions.isContentionAnalysisSupported = &isContentionAnalysisSupported;
		699	ECWrapper::m_ECFunctions.isCalcStackMap = &isCalcStackMap;
693	ECWrapper::m_ECFunctions.getUnknownOptionByName = &getUnknownOptionByName;	700	ECWrapper::m_ECFunctions.getUnknownOptionByName = &getUnknownOptionByName;
694	ECWrapper::m_ECFunctions.VMInitDone = &VMInitDone;	701	ECWrapper::m_ECFunctions.VMInitDone = &VMInitDone;
695	ECWrapper::m_EC_Env.functions = &ECWrapper::m_ECFunctions;	702	ECWrapper::m_EC_Env.functions = &ECWrapper::m_ECFunctions;

Lines 80-89 Link Here

(-)src-native/src/Martini/Infrastructure/HeapAdaptor/HeapAdaptor.cpp (-2 / +4 lines)
80	}	80	}
81	}	81	}
82		82
83	TResult CHeapAdaptor::Init(ILogAssert pLogger, MPI::IEventFilter pFilter)	83	TResult CHeapAdaptor::Init(ILogAssert *pLogger,
		84	MPI::IEventFilter* pFilter,
		85	MPI::BitSet configFlags)
84	{	86	{
85	// Call common initializer	87	// Call common initializer
86	TResult res = CInstrumentationAdaptorBase::Init(pLogger);	88	TResult res = CInstrumentationAdaptorBase::Init(pLogger, configFlags);
87	if (MRTE_FAILED(res))	89	if (MRTE_FAILED(res))
88	{	90	{
89	return MRTE_ERROR_FAIL;	91	return MRTE_ERROR_FAIL;

Lines 4-9 Link Here

(-)src-native/src/Martini/Infrastructure/HeapAdaptor/Makefile (+2 lines)
4	INCLUDES = -I ../Include \	4	INCLUDES = -I ../Include \
5	-I ../../Include \	5	-I ../../Include \
6	-I ../../../../include/Martini \	6	-I ../../../../include/Martini \
		7	-I $(JAVA_HOME)/include \
		8	-I $(JAVA_HOME)/include/lin32 \
7	-I $(ROOTDIR)/src/Lin/unix	9	-I $(ROOTDIR)/src/Lin/unix
8		10
9	OBJS = $(OBJDIR)/HeapAdaptor.o \	11	OBJS = $(OBJDIR)/HeapAdaptor.o \

Lines 29-35 Link Here

(-)src-native/src/Martini/Infrastructure/JPI/JpiGlobals.cpp (-1 / +1 lines)
29	: pfnMethodEnterHandler(NULL), pfnMethodLeaveHandler(NULL),	29	: pfnMethodEnterHandler(NULL), pfnMethodLeaveHandler(NULL),
30	pfnMethodLeaveWithExcetionHandler(NULL), pfnObjectAllocHandler(NULL),	30	pfnMethodLeaveWithExcetionHandler(NULL), pfnObjectAllocHandler(NULL),
31	pfnArrayAllocHandler(NULL), pJvmInterface(NULL), bJvmInitDone(false),	31	pfnArrayAllocHandler(NULL), pJvmInterface(NULL), bJvmInitDone(false),
32	m_ptlsMpiThreadStatus(NULL)	32	m_ptlsMpiThreadStatus(NULL), configFlags(MPI::CF_NONE), pConfigData(NULL)
33	{	33	{
34	if (!m_ptlsMpiThreadStatus)	34	if (!m_ptlsMpiThreadStatus)
35	{	35	{

Lines 491-493 Link Here

(-)src-native/src/Martini/Infrastructure/JPI/JPIKernel.cpp (+6 lines)
491		491
492	return res;	492	return res;
493	}	493	}
		494
		495	TResult CJPIKernel::Configure(BitSet configuration)
		496	{
		497	CJpiGlobals::Instance()->configFlags = configuration;
		498	return MRTE_RESULT_OK;
		499	}

Lines 128-133 Link Here

(-)src-native/src/Martini/Infrastructure/JPI/JpiGlobals.h (+6 lines)
128		128
129	// VM initialization status	129	// VM initialization status
130	bool bJvmInitDone;	130	bool bJvmInitDone;
		131
		132	// JPI Configuration flags (one or more MPI::EConfigurationFlags values)
		133	MPI::BitSet configFlags;
		134
		135	// JPI Configuration data
		136	MPI::SConfigData* pConfigData;
131		137
132	private:	138	private:
133	CJpiGlobals();	139	CJpiGlobals();

Lines 295-301 Link Here

(-)src-native/src/Martini/Infrastructure/JPI/JavaInstrumentorManager.cpp (-7 / +24 lines)
295	//////////////////////////////////////////////////////////////////////////	295	//////////////////////////////////////////////////////////////////////////
296	// CCgAdaptorDelegate	296	// CCgAdaptorDelegate
297		297
298	TResult CCgAdaptorDelegate::Init(ILogAssert pLogger, MPI::IEventFilter pFilter)	298	TResult CCgAdaptorDelegate::Init(ILogAssert *pLogger,
		299	MPI::IEventFilter *pFilter,
		300	MPI::BitSet configFlags)
299	{	301	{
300	MPI::ICallGraphFilter pCgFilter = (MPI::ICallGraphFilter)pFilter;	302	MPI::ICallGraphFilter pCgFilter = (MPI::ICallGraphFilter)pFilter;
301	m_CGFilterProxy.Init(pCgFilter);	303	m_CGFilterProxy.Init(pCgFilter);
Lines 326-332 Link Here
326	}	328	}
327		329
328	// Initialize the Adaptor	330	// Initialize the Adaptor
329	TResult res = m_pAdaptor->Init(CLogAssert::GetInstance(), &m_CGFilterProxy);	331	TResult res = m_pAdaptor->Init(CLogAssert::GetInstance(), &m_CGFilterProxy, configFlags);
330	return res;	332	return res;
331	}	333	}
332		334
Lines 479-485 Link Here
479		481
480		482
481		483
482	TResult CThreadAdaptorDelegate::Init(ILogAssert pLogger, MPI::IEventFilter pFilter)	484	TResult CThreadAdaptorDelegate::Init(ILogAssert *pLogger,
		485	MPI::IEventFilter *pFilter,
		486	MPI::BitSet configFlags)
483	{	487	{
484	//Add filtering support	488	//Add filtering support
485	MPI::IThreadInteractionFilter pThreadInteractionFilter = (MPI::IThreadInteractionFilter)pFilter;	489	MPI::IThreadInteractionFilter pThreadInteractionFilter = (MPI::IThreadInteractionFilter)pFilter;
Lines 511-517 Link Here
511	}	515	}
512		516
513	// Initialize the Adaptor	517	// Initialize the Adaptor
514	TResult res = m_pAdaptor->Init(CLogAssert::GetInstance(), &m_ThreadInteractionFilterProxy);	518	TResult res = m_pAdaptor->Init(CLogAssert::GetInstance(), &m_ThreadInteractionFilterProxy,
		519	configFlags);
515	return MRTE_RESULT_OK;	520	return MRTE_RESULT_OK;
516	}	521	}
517		522
Lines 730-736 Link Here
730	//////////////////////////////////////////////////////////////////////////	735	//////////////////////////////////////////////////////////////////////////
731	// CHeapAdaptorDelegate	736	// CHeapAdaptorDelegate
732		737
733	TResult CHeapAdaptorDelegate::Init(ILogAssert pLogger, MPI::IEventFilter pFilter)	738	TResult CHeapAdaptorDelegate::Init(ILogAssert *pLogger,
		739	MPI::IEventFilter *pFilter,
		740	MPI::BitSet configFlags)
734	{	741	{
735	if (!m_pAdaptor)	742	if (!m_pAdaptor)
736	{	743	{
Lines 758-764 Link Here
758	}	765	}
759		766
760	// Initialize the Adaptor	767	// Initialize the Adaptor
761	TResult res = m_pAdaptor->Init(CLogAssert::GetInstance());	768	TResult res = m_pAdaptor->Init(CLogAssert::GetInstance(), NULL, configFlags);
762	return res;	769	return res;
763	}	770	}
764		771
Lines 1036-1042 Link Here
1036	m_pAdaptor = CAdaptorFactory::Instance()->CreateAdaptor(group);	1043	m_pAdaptor = CAdaptorFactory::Instance()->CreateAdaptor(group);
1037	if (NULL != m_pAdaptor)	1044	if (NULL != m_pAdaptor)
1038	{	1045	{
1039	res = m_pAdaptor->Init(CLogAssert::GetInstance(), pEventFilter);	1046	res = m_pAdaptor->Init(CLogAssert::GetInstance(), pEventFilter,
		1047	CJpiGlobals::Instance()->configFlags);
1040	}	1048	}
1041	return res;	1049	return res;
1042	}	1050	}
Lines 1211-1216 Link Here
1211	return;	1219	return;
1212	}	1220	}
1213		1221
		1222	// If StackMapTable attribute calculation is enabled, then bootstrap classes
		1223	// (i.e., classes loaded before VMInit) are not instrumented.
		1224	if ((CJpiGlobals::Instance()->configFlags & MPI::CF_JAVA_ENABLE_STACKMAP_CALC)
		1225	&& !m_bJVMInit)
		1226	{
		1227	SetClassFileNotInstrumented(pJVMEvent);
		1228	return;
		1229	}
		1230
1214	TResult iRetVal = MRTE_RESULT_OK;	1231	TResult iRetVal = MRTE_RESULT_OK;
1215	if (m_bIsTentativeInstrumentation && !m_bHasFirstClassLoadHookArrived)	1232	if (m_bIsTentativeInstrumentation && !m_bHasFirstClassLoadHookArrived)
1216	{	1233	{

Lines 50-60 Link Here

(-)src-native/src/Martini/Infrastructure/JPI/JPIKernel.h (-5 / +1 lines)
50	const char *szOptions);	50	const char *szOptions);
51	virtual Infrastructure::SClientInfo *GetClientInfo(MPI::TId id);	51	virtual Infrastructure::SClientInfo *GetClientInfo(MPI::TId id);
52	virtual Infrastructure::SClientInfo GetClientInfo(const char szClientName);	52	virtual Infrastructure::SClientInfo GetClientInfo(const char szClientName);
53	virtual TResult Configure(unsigned int configuration)	53	virtual TResult Configure(MPI::BitSet configuration);
54	{
55	return MRTE_ERROR_NOT_SUPPORTED;
56	}
57
58	virtual TResult SuspendVM();	54	virtual TResult SuspendVM();
59	virtual TResult ResumeVM();	55	virtual TResult ResumeVM();
60	virtual TResult RunGC();	56	virtual TResult RunGC();




        // IInstrumentationAdaptor methods

        virtual TResult Init(Infrastructure::ILogAssert *pLogger = NULL,
                             MPI::IEventFilter* pFilter = NULL,
                             MPI::BitSet configFlags = MPI::CF_NONE);
        virtual TResult ModifyClass(MPI::TId classId, 
                                    const Infrastructure::SClassFile &classToInstrument,
                                    TMemoryAllocatorFunc funcAllocator,

        // IInstrumentationAdaptor methods

        virtual TResult Init(Infrastructure::ILogAssert *pLogger = NULL,
                             MPI::IEventFilter* pFilter = NULL,
                             MPI::BitSet configFlags = MPI::CF_NONE);
        virtual TResult ModifyClass(MPI::TId classId, 
                                    const Infrastructure::SClassFile &classToInstrument,
                                    TMemoryAllocatorFunc funcAllocator,

        // IInstrumentationAdaptor methods

        virtual TResult Init(Infrastructure::ILogAssert *pLogger = NULL,
                             MPI::IEventFilter* pFilter = NULL,
                             MPI::BitSet configFlags = MPI::CF_NONE);
        virtual TResult ModifyClass(MPI::TId classId, 
                                    const Infrastructure::SClassFile &classToInstrument,
                                    TMemoryAllocatorFunc funcAllocator,

Lines 96-101 Link Here

(-)src-native/include/JPIAgent/EC_Env.h (+5 lines)
96	bool (ECCALL isEnabled)(EC_Env env);	96	bool (ECCALL isEnabled)(EC_Env env);
97	bool (ECCALL isAllocSitesSupported)(EC_Env env);	97	bool (ECCALL isAllocSitesSupported)(EC_Env env);
98	bool (ECCALL isContentionAnalysisSupported)(EC_Env env);	98	bool (ECCALL isContentionAnalysisSupported)(EC_Env env);
		99	bool (ECCALL isCalcStackMap)(EC_Env env);
99		100
100	const char(ECCALL getUnknownOptionByName)(EC_Env* env, const char* name);	101	const char(ECCALL getUnknownOptionByName)(EC_Env* env, const char* name);
101		102
Lines 242-247 Link Here
242	return functions->isContentionAnalysisSupported(this);	243	return functions->isContentionAnalysisSupported(this);
243	}	244	}
244		245
		246	bool isCalcStackMap() {
		247	return functions->isCalcStackMap(this);
		248	}
		249
245	const char* getUnknownOptionByName( const char* name ) {	250	const char* getUnknownOptionByName( const char* name ) {
246	return functions->getUnknownOptionByName(this, name);	251	return functions->getUnknownOptionByName(this, name);
247	}	252	}

Lines 86-95 Link Here

(-)src-native/src/Martini/Infrastructure/ThreadAdaptor/ThreadAdaptor.cpp (-2 / +4 lines)
86	{	86	{
87	}	87	}
88		88
89	TResult CThreadAdaptor::Init(ILogAssert pLogger, MPI::IEventFilter pFilter)	89	TResult CThreadAdaptor::Init(ILogAssert *pLogger,
		90	MPI::IEventFilter *pFilter,
		91	MPI::BitSet configFlags)
90	{	92	{
91	// Call common initializer	93	// Call common initializer
92	TResult res = CInstrumentationAdaptorBase::Init(pLogger);	94	TResult res = CInstrumentationAdaptorBase::Init(pLogger, configFlags);
93	if (MRTE_FAILED(res))	95	if (MRTE_FAILED(res))
94	{	96	{
95	return MRTE_ERROR_FAIL;	97	return MRTE_ERROR_FAIL;




ifdef RELEASE
    OBJDIR = release/$(PLATFORM_NAME)$(DIR_EXTENTION)
    OUTDIR = $(ROOTDIR)/bin/linux/release/$(PLATFORM_NAME)$(DIR_EXTENTION)
    PLATFORM_AND_MODE_NAME = release/$(PLATFORM_NAME)
else
    ifdef RELEASE_WD
        OBJDIR = release_debug_info/$(PLATFORM_NAME)$(DIR_EXTENTION)
        OUTDIR = $(ROOTDIR)/bin/linux/release_debug_info/$(PLATFORM_NAME)$(DIR_EXTENTION)
	    PLATFORM_AND_MODE_NAME = release_debug_info/$(PLATFORM_NAME)
    else
        OBJDIR = debug/$(PLATFORM_NAME)$(DIR_EXTENTION)
        OUTDIR = $(ROOTDIR)/bin/linux/debug/$(PLATFORM_NAME)$(DIR_EXTENTION)
	    PLATFORM_AND_MODE_NAME = debug/$(PLATFORM_NAME)
    endif
endif


Lines 17-22 Link Here

(-)src-native/src/Martini/Infrastructure/CGAdaptor/CGAdaptor.cpp (-11 / +30 lines)
17	#include "HeapProxy.h"	17	#include "HeapProxy.h"
18	#include "ThreadProxy.h"	18	#include "ThreadProxy.h"
19	#include "ValidityChecks.h"	19	#include "ValidityChecks.h"
		20	#include "MRTEInfrastructureDefinitions.h"
20		21
21	#include <assert.h>	22	#include <assert.h>
22	#include <string.h>	23	#include <string.h>
Lines 67-76 Link Here
67	}	68	}
68	}	69	}
69		70
70	TResult CCGAdaptor::Init(ILogAssert pLogger, MPI::IEventFilter pFilter)	71	TResult CCGAdaptor::Init(ILogAssert *pLogger,
		72	MPI::IEventFilter* pFilter,
		73	MPI::BitSet configFlags)
71	{	74	{
72	// Call common initializer	75	// Call common initializer
73	TResult res = CInstrumentationAdaptorBase::Init(pLogger);	76	TResult res = CInstrumentationAdaptorBase::Init(pLogger, configFlags);
74	if (MRTE_FAILED(res))	77	if (MRTE_FAILED(res))
75	{	78	{
76	return MRTE_ERROR_FAIL;	79	return MRTE_ERROR_FAIL;
Lines 378-384 Link Here
378	// If no methods were instrumented, modify the return code to indicate this	381	// If no methods were instrumented, modify the return code to indicate this
379	if (MRTE_SUCCEEDED(res) && instrMethodCount == 0)	382	if (MRTE_SUCCEEDED(res) && instrMethodCount == 0)
380	{	383	{
381	LOG_INFORMATIVE1("CGAdaptor", 3, false, "Class %s was not instrumented because all its methods were excluded",	384	LOG_INFORMATIVE1("CGAdaptor", 3, false,
		385	"Class %s was not instrumented because all its methods were excluded",
382	classInfo.szClassName);	386	classInfo.szClassName);
383	res = MRTE_ERROR_INSTRUMENTATION_NOT_NEEDED;	387	res = MRTE_ERROR_INSTRUMENTATION_NOT_NEEDED;
384	}	388	}
Lines 672-677 Link Here
672	return MRTE_RESULT_OK;	676	return MRTE_RESULT_OK;
673	}	677	}
674		678
		679	// If StackMapTable calculation (Java 6) is enabled, do not instrument constructors.
		680	// This is a temporary workaround for https://bugs.eclipse.org/170075 until a better
		681	// solution is implemented.
		682	if (IsStackMapCalcEnabled())
		683	{
		684	if (IsConstructor(pInfo->szName))
		685	{
		686	return MRTE_RESULT_OK;
		687	}
		688	}
		689
		690
675	TVariableID isJVMInitVar = (TVariableID)-1;	691	TVariableID isJVMInitVar = (TVariableID)-1;
676	res = InjectPrologCode(pMethod, pInstructionsIter, pInfo->cpAlreadyInvokedFlag,	692	res = InjectPrologCode(pMethod, pInstructionsIter, pInfo->cpAlreadyInvokedFlag,
677	cpMethodId, cpEntryCallback, cpIsJVMInit, bJVMInitDone, &isJVMInitVar);	693	cpMethodId, cpEntryCallback, cpIsJVMInit, bJVMInitDone, &isJVMInitVar);
Lines 681-687 Link Here
681	}	697	}
682		698
683	res = InjectEpilogCode(pMethod, pInstructionsIter, pOriginalFirstInstr, isJVMInitVar,	699	res = InjectEpilogCode(pMethod, pInstructionsIter, pOriginalFirstInstr, isJVMInitVar,
684	cpMethodId, cpLeaveCallback, bJVMInitDone);	700	cpMethodId, cpLeaveCallback, bJVMInitDone,
		701	IsConstructor(pInfo->szName));
		702
		703	if (MRTE_RESULT_OK != res)
		704	{
		705	return res;
		706	}
685		707
686	pInstructionsIter->Free();	708	pInstructionsIter->Free();
687	res = pMethod->ApplyInstrumentation();	709	res = pMethod->ApplyInstrumentation();
Lines 837-843 Link Here
837	TVariableID isJVMInitVar,	859	TVariableID isJVMInitVar,
838	TConstantPoolIndex cpiMethodId,	860	TConstantPoolIndex cpiMethodId,
839	TConstantPoolIndex cpiLeaveCallback,	861	TConstantPoolIndex cpiLeaveCallback,
840	bool bJVMInitDone)	862	bool bJVMInitDone,
		863	bool bIsConstructor)
841	{	864	{
842	TResult res;	865	TResult res;
843		866
Lines 953-964 Link Here
953	return MRTE_RESULT_OK;	976	return MRTE_RESULT_OK;
954	}	977	}
955		978
956	/*	979	bool CCGAdaptor::IsConstructor(const char *szMethodName)
957	bool CCGAdaptor::IsConstructor(const SJavaMethodInfo &methodInfo)
958	{	980	{
959	bool bIsCtor;	981	bool bIsCtor;
960	char *szName = CWideStringUtils::WideStringToCString(methodInfo.methodName);	982	if (strcmp(szMethodName, JAVA_INSTANCE_CONSTRUCTOR_NAME) == 0)
961	if (strcmp(szName, JAVA_INSTANCE_CONSTRUCTOR_NAME) == 0)
962	{	983	{
963	bIsCtor = true;	984	bIsCtor = true;
964	}	985	}
Lines 966-975 Link Here
966	{	987	{
967	bIsCtor = false;	988	bIsCtor = false;
968	}	989	}
969	delete szName;
970	return bIsCtor;	990	return bIsCtor;
971	}	991	}
972	*/
973		992
974	bool CCGAdaptor::IsProblematicMethod(const char *szClassName,	993	bool CCGAdaptor::IsProblematicMethod(const char *szClassName,
975	const char *szMethodName)	994	const char *szMethodName)

Line 1 Link Here

(-)src-native/src/Martini/Infrastructure/CGAdaptor/.cvsignore (+1 lines)
1	debug	1	debug
		2	CGAdaptor.plg

Lines 4-9 Link Here

(-)src-native/src/Martini/Infrastructure/CGAdaptor/Makefile (+2 lines)
4	INCLUDES = -I ../Include \	4	INCLUDES = -I ../Include \
5	-I ../../Include \	5	-I ../../Include \
6	-I ../../../../include/Martini \	6	-I ../../../../include/Martini \
		7	-I $(JAVA_HOME)/include \
		8	-I $(JAVA_HOME)/include/lin32 \
7	-I $(ROOTDIR)/src/Lin/unix	9	-I $(ROOTDIR)/src/Lin/unix
8		10
9	OBJS = $(OBJDIR)/CGAdaptor.o \	11	OBJS = $(OBJDIR)/CGAdaptor.o \

Lines 64-69 Link Here

(-)src-native/src/BaseProf/BaseProfiler.cpp (+5 lines)
64	return retVal;	64	return retVal;
65	}	65	}
66		66
		67	if (m_pProfEnv.ec_env->isCalcStackMap()) {
		68	pMpiApi->Configure(CF_JAVA_ENABLE_STACKMAP_CALC);
		69	}
		70
		71
67	retVal = InitFilter();	72	retVal = InitFilter();
68	return retVal;	73	return retVal;
69	}	74	}

Lines 584-589 Link Here

(-)src-native/src/Martini/Include/JIE.h (+9 lines)
584	*/	584	*/
585	virtual IJavaClass GetClassInterface(const unsigned char pucClassFile,	585	virtual IJavaClass GetClassInterface(const unsigned char pucClassFile,
586	unsigned int uiClassSize) const = 0;	586	unsigned int uiClassSize) const = 0;
		587
		588
		589	/**
		590	* @brief enable the creation of the StackMapTable method
		591	* attribute when instrumenting Java classes with version >= 50.0
		592	* (Java 6 and above)
		593	*/
		594	virtual void EnableStackMapCalculation() const = 0;
		595
587	};	596	};
588		597
589	/**	598	/**




// Default constructor
//
CInstrumentationAdaptorBase::CInstrumentationAdaptorBase()
: m_bJVMInitDone(false), m_pLogger(NULL), m_configFlags(MPI::CF_NONE)
{
}


{
}

TResult CInstrumentationAdaptorBase::Init(ILogAssert *pLogger /* = NULL */, 
                                          MPI::BitSet configFlags /* = MPI::CF_NONE */)
{
    m_pLogger = pLogger;
    m_configFlags = configFlags;
    m_pJIE = InitJIE();
    if (NULL == m_pJIE)
    {
        return MRTE_ERROR_FAIL;
    }

    return MRTE_RESULT_OK;
}

void CInstrumentationAdaptorBase::JvmInitDone()
{
    if (IsStackMapCalcEnabled())
    {
        m_pJIE->EnableStackMapCalculation();
    }
    m_bJVMInitDone = true;
}

bool CInstrumentationAdaptorBase::IsStackMapCalcEnabled()
{
    return (m_configFlags & MPI::CF_JAVA_ENABLE_STACKMAP_CALC);
}

IJIE* CInstrumentationAdaptorBase::InitJIE()
{
    const char *JIE_DLL = "JIE";

Lines 170-175 Link Here

(-)src-native/include/Martini/MpiAPI.h (-1 / +6 lines)
170	//!< None	170	//!< None
171	CF_NONE = 0x00000000,	171	CF_NONE = 0x00000000,
172		172
		173	//! @brief Set this to enable the creation of the StackMapTable method
		174	//! attribute when instrumenting Java classes with version >= 50.0
		175	//! (Java 6 and above)
		176	CF_JAVA_ENABLE_STACKMAP_CALC = 0x00000001,
		177
173	//! @brief Set this to receive native VM id's instead of MPI allocated id's.	178	//! @brief Set this to receive native VM id's instead of MPI allocated id's.
174	//! Applies for the following MPI elements: thread, module, class and method	179	//! Applies for the following MPI elements: thread, module, class and method
175	CF_DOTNET_USE_VM_IDS = 0x00010000,	180	CF_DOTNET_USE_VM_IDS = 0x00010000,
Lines 181-187 Link Here
181	CF_DOTNET_DISABLE_PREJIT_USE = 0x00040000,	186	CF_DOTNET_DISABLE_PREJIT_USE = 0x00040000,
182		187
183	//! @brief End sentinel	188	//! @brief End sentinel
184	CF_LAST = 0x80080000	189	CF_LAST = 0x80100000
185	};	190	};
186		191
187	/**	192	/**

Lines 1-5 Link Here

(-)readme.txt (-2 / +7 lines)
1	/****************************************************************************	1	/****************************************************************************
2	* Copyright (c) 2005 - 2007 Intel Corporation.	2	* Copyright (c) 2005 - 2008 Intel Corporation.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 20-25 Link Here
20	(Martini SDK)	20	(Martini SDK)
21	Alexander Alexeev, Intel	21	Alexander Alexeev, Intel
22	Stanislav V. Polevic, Intel	22	Stanislav V. Polevic, Intel
		23	Vasily Levchenko, Intel
23		24
24	JVMTI Profiler in TPTP 4.4	25	JVMTI Profiler in TPTP 4.4
25		26
Lines 79-85 Link Here
79	a file named jvmti.pro in the current directory	80	a file named jvmti.pro in the current directory
80	(if such file exists).	81	(if such file exists).
81	Only applicable when server=standalone.	82	Only applicable when server=standalone.
82		83	api=true\|false - Whether to enable the Profiler API or not. Default is false.
		84	stackmap=true\|false - Whether to recalculate the StackMapTable attribute of
		85	instrumented methods.
		86	Use only when experiencing verification errors in
		87	Java 1.6+. Default is false.
83	<profiler> - the profiler to launch:	88	<profiler> - the profiler to launch:
84	CGProf execution time analysis	89	CGProf execution time analysis
85	Supported options:	90	Supported options:

Return to bug 148629

Lines 49-55 Link Here

(-)src-native/src/Martini/Infrastructure/JIE/JIE.dsp (-8 / +12 lines)
49	# PROP Target_Dir ""	49	# PROP Target_Dir ""
50	F90=df.exe	50	F90=df.exe
51	# ADD BASE CPP /nologo /MT /W3 /GX /O2 /I "..\Include" /I "..\..\Include" /I "..\..\..\Include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "JIE_EXPORTS" /FD /c	51	# ADD BASE CPP /nologo /MT /W3 /GX /O2 /I "..\Include" /I "..\..\Include" /I "..\..\..\Include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "JIE_EXPORTS" /FD /c
52	# ADD CPP /nologo /MT /W3 /GX /Zi /O2 /I "..\Include" /I "..\..\Include" /I "..\..\..\..\include\Martini" /I "..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\BCI\Common" /I "..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\BCI\BCIEng" /I "..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\BCI\BCIEng\BCIEngJ" /I "..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\BCI\JClass" /D "NDEBUG" /D "IA32_ARCH" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "JIE_EXPORTS" /D "MARTINI_JIE" /FD /c	52	# ADD CPP /nologo /MT /W3 /GX /Zi /O2 /I "..\Include" /I "..\..\Include" /I "..\..\..\..\include\Martini" /I "..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\BCI\Common" /I "..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\BCI\BCIEng" /I "..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\BCI\BCIEng\BCIEngJ" /I "..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\BCI\JClass" /I "..\..\..\..\..\..\org.apache.harmony_vmcore_verifier\src\include" /I "..\..\..\..\..\..\org.apache.harmony_vmcore_verifier\src\vmcore\include" /I "..\..\..\..\..\..\org.apache.harmony_vmcore_verifier\src\vmcore\src\verifier-3363\x_verifier" /I "$(JAVA_HOME)\include" /I "$(JAVA_HOME)\include\win32" /D "NDEBUG" /D "IA32_ARCH" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "JIE_EXPORTS" /D "MARTINI_JIE" /D "STATIC_BUILD" /FD /c
53	# SUBTRACT CPP /Fr	53	# SUBTRACT CPP /Fr
54	# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32	54	# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
55	# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32	55	# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
Lines 60-66 Link Here
60	# ADD BSC32 /nologo	60	# ADD BSC32 /nologo
61	LINK32=link.exe	61	LINK32=link.exe
62	# ADD BASE LINK32 kernel32.lib /nologo /dll /machine:I386	62	# ADD BASE LINK32 kernel32.lib /nologo /dll /machine:I386
63	# ADD LINK32 kernel32.lib MartiniOSA.lib /nologo /dll /debug /machine:I386 /libpath:"..\..\..\..\bin\windows\release\IA-32"	63	# ADD LINK32 kernel32.lib MartiniOSA.lib verifier.lib /nologo /dll /debug /machine:I386 /libpath:"..\..\..\..\bin\windows\release\IA-32" /libpath:"..\..\..\..\..\..\org.apache.harmony_vmcore_verifier\lib\windows\release\IA-32"
64	# SUBTRACT LINK32 /incremental:yes	64	# SUBTRACT LINK32 /incremental:yes
65		65
66	!ELSEIF "$(CFG)" == "JIE - Win32 IA32 Debug"	66	!ELSEIF "$(CFG)" == "JIE - Win32 IA32 Debug"
Lines 79-85 Link Here
79	# PROP Target_Dir ""	79	# PROP Target_Dir ""
80	F90=df.exe	80	F90=df.exe
81	# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\Include" /I "..\..\Include" /I "..\..\..\Include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "JIE_EXPORTS" /FR /FD /GZ /c	81	# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\Include" /I "..\..\Include" /I "..\..\..\Include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "JIE_EXPORTS" /FR /FD /GZ /c
82	# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\Include" /I "..\..\Include" /I "..\..\..\..\include\Martini" /I "..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\BCI\Common" /I "..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\BCI\BCIEng" /I "..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\BCI\BCIEng\BCIEngJ" /I "..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\BCI\JClass" /D "_DEBUG" /D "IA32_ARCH" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "JIE_EXPORTS" /D "MARTINI_JIE" /FR /FD /GZ /c	82	# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\Include" /I "..\..\Include" /I "..\..\..\..\include\Martini" /I "..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\BCI\Common" /I "..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\BCI\BCIEng" /I "..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\BCI\BCIEng\BCIEngJ" /I "..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\BCI\JClass" /I "..\..\..\..\..\..\org.apache.harmony_vmcore_verifier\src\include" /I "..\..\..\..\..\..\org.apache.harmony_vmcore_verifier\src\vmcore\include" /I "..\..\..\..\..\..\org.apache.harmony_vmcore_verifier\src\vmcore\src\verifier-3363\x_verifier" /I "$(JAVA_HOME)\include" /I "$(JAVA_HOME)\include\win32" /D "_DEBUG" /D "IA32_ARCH" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "JIE_EXPORTS" /D "MARTINI_JIE" /D "STATIC_BUILD" /FR /FD /GZ /c
83	# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32	83	# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
84	# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32	84	# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
85	# ADD BASE RSC /l 0x409 /d "_DEBUG"	85	# ADD BASE RSC /l 0x409 /d "_DEBUG"
Lines 89-95 Link Here
89	# ADD BSC32 /nologo	89	# ADD BSC32 /nologo
90	LINK32=link.exe	90	LINK32=link.exe
91	# ADD BASE LINK32 kernel32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept	91	# ADD BASE LINK32 kernel32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
92	# ADD LINK32 kernel32.lib MartiniOSA.lib /nologo /dll /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\bin\windows\debug\IA-32"	92	# ADD LINK32 kernel32.lib MartiniOSA.lib verifier.lib /nologo /dll /map /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\bin\windows\debug\IA-32" /libpath:"..\..\..\..\..\..\org.apache.harmony_vmcore_verifier\lib\windows\debug\IA-32"
93	# SUBTRACT LINK32 /incremental:no	93	# SUBTRACT LINK32 /incremental:no
94		94
95	!ELSEIF "$(CFG)" == "JIE - Win32 EM64T Debug"	95	!ELSEIF "$(CFG)" == "JIE - Win32 EM64T Debug"
Lines 108-114 Link Here
108	# PROP Target_Dir ""	108	# PROP Target_Dir ""
109	F90=df.exe	109	F90=df.exe
110	# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\Include" /I "..\..\Include" /I "..\..\..\Include" /I "..\Include\win" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "JIE_EXPORTS" /FR /FD /GZ /c	110	# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\Include" /I "..\..\Include" /I "..\..\..\Include" /I "..\Include\win" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "JIE_EXPORTS" /FR /FD /GZ /c
111	# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\Include" /I "..\..\Include" /I "..\..\..\..\include\Martini" /I "..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\BCI\Common" /I "..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\BCI\BCIEng" /I "..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\BCI\BCIEng\BCIEngJ" /I "..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\BCI\JClass" /D "_DEBUG" /D "EM64T_ARCH" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "JIE_EXPORTS" /D "MARTINI_JIE" /FD /GZ /c	111	# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\Include" /I "..\..\Include" /I "..\..\..\..\include\Martini" /I "..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\BCI\Common" /I "..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\BCI\BCIEng" /I "..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\BCI\BCIEng\BCIEngJ" /I "..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\BCI\JClass" /D "_DEBUG" /D "EM64T_ARCH" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "JIE_EXPORTS" /D "MARTINI_JIE" /D "VERIFIER_STANDALONE" /FD /GZ /c
112	# SUBTRACT CPP /Fr	112	# SUBTRACT CPP /Fr
113	# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32	113	# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
114	# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32	114	# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
Lines 138-144 Link Here
138	# PROP Target_Dir ""	138	# PROP Target_Dir ""
139	F90=df.exe	139	F90=df.exe
140	# ADD BASE CPP /nologo /MT /W3 /GX /O2 /I "..\Include" /I "..\..\Include" /I "..\..\..\Include" /I "..\Include\win" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "JIE_EXPORTS" /FD /c	140	# ADD BASE CPP /nologo /MT /W3 /GX /O2 /I "..\Include" /I "..\..\Include" /I "..\..\..\Include" /I "..\Include\win" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "JIE_EXPORTS" /FD /c
141	# ADD CPP /nologo /MT /W3 /GX /Zi /O2 /I "..\Include" /I "..\..\Include" /I "..\..\..\..\include\Martini" /I "..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\BCI\Common" /I "..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\BCI\BCIEng" /I "..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\BCI\BCIEng\BCIEngJ" /I "..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\BCI\JClass" /D "NDEBUG" /D "EM64T_ARCH" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "JIE_EXPORTS" /D "MARTINI_JIE" /FD /c	141	# ADD CPP /nologo /MT /W3 /GX /Zi /O2 /I "..\Include" /I "..\..\Include" /I "..\..\..\..\include\Martini" /I "..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\BCI\Common" /I "..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\BCI\BCIEng" /I "..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\BCI\BCIEng\BCIEngJ" /I "..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\BCI\JClass" /D "NDEBUG" /D "EM64T_ARCH" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "JIE_EXPORTS" /D "MARTINI_JIE" /D "VERIFIER_STANDALONE" /FD /c
142	# SUBTRACT CPP /Fr	142	# SUBTRACT CPP /Fr
143	# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32	143	# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
144	# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32	144	# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
Lines 168-174 Link Here
168	# PROP Target_Dir ""	168	# PROP Target_Dir ""
169	F90=df.exe	169	F90=df.exe
170	# ADD BASE CPP /nologo /MT /W3 /GX /O2 /I "..\Include" /I "..\..\Include" /I "..\..\..\Include" /I "..\Include\win" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "JIE_EXPORTS" /FD /c	170	# ADD BASE CPP /nologo /MT /W3 /GX /O2 /I "..\Include" /I "..\..\Include" /I "..\..\..\Include" /I "..\Include\win" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "JIE_EXPORTS" /FD /c
171	# ADD CPP /nologo /MT /W3 /GX /Zi /O2 /I "..\Include" /I "..\..\Include" /I "..\..\..\..\include\Martini" /I "..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\BCI\Common" /I "..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\BCI\BCIEng" /I "..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\BCI\BCIEng\BCIEngJ" /I "..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\BCI\JClass" /D "NDEBUG" /D "IPF_ARCH" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "JIE_EXPORTS" /D "MARTINI_JIE" /FD /c	171	# ADD CPP /nologo /MT /W3 /GX /Zi /O2 /I "..\Include" /I "..\..\Include" /I "..\..\..\..\include\Martini" /I "..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\BCI\Common" /I "..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\BCI\BCIEng" /I "..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\BCI\BCIEng\BCIEngJ" /I "..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\BCI\JClass" /D "NDEBUG" /D "IPF_ARCH" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "JIE_EXPORTS" /D "MARTINI_JIE" /D "VERIFIER_STANDALONE" /FD /c
172	# SUBTRACT CPP /Fr	172	# SUBTRACT CPP /Fr
173	# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32	173	# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
174	# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32	174	# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
Lines 198-204 Link Here
198	# PROP Target_Dir ""	198	# PROP Target_Dir ""
199	F90=df.exe	199	F90=df.exe
200	# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\Include" /I "..\..\Include" /I "..\..\..\Include" /I "..\Include\win" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "JIE_EXPORTS" /FR /FD /GZ /c	200	# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\Include" /I "..\..\Include" /I "..\..\..\Include" /I "..\Include\win" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "JIE_EXPORTS" /FR /FD /GZ /c
201	# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\Include" /I "..\..\Include" /I "..\..\..\..\include\Martini" /I "..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\BCI\Common" /I "..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\BCI\BCIEng" /I "..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\BCI\BCIEng\BCIEngJ" /I "..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\BCI\JClass" /D "_DEBUG" /D "IPF_ARCH" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "JIE_EXPORTS" /D "MARTINI_JIE" /FD /GZ /c	201	# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\Include" /I "..\..\Include" /I "..\..\..\..\include\Martini" /I "..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\BCI\Common" /I "..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\BCI\BCIEng" /I "..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\BCI\BCIEng\BCIEngJ" /I "..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\BCI\JClass" /D "_DEBUG" /D "IPF_ARCH" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "JIE_EXPORTS" /D "MARTINI_JIE" /D "VERIFIER_STANDALONE" /FD /GZ /c
202	# SUBTRACT CPP /Fr	202	# SUBTRACT CPP /Fr
203	# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32	203	# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
204	# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32	204	# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
Lines 235-240 Link Here
235	# End Source File	235	# End Source File
236	# Begin Source File	236	# Begin Source File
237		237
		238	SOURCE="..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\BCI\BCIEng\BCIEngJ\class_interface.cpp"
		239	# End Source File
		240	# Begin Source File
		241
238	SOURCE="..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\BCI\Common\Command.cpp"	242	SOURCE="..\..\..\..\..\..\org.eclipse.hyades.probekit\src-native\BCI\Common\Command.cpp"
239	# End Source File	243	# End Source File
240	# Begin Source File	244	# Begin Source File

Lines 12-24 Link Here

(-)src-native/src/Martini/Infrastructure/JIE/JIE.cpp (-1 / +43 lines)
12	*****************************************************************************/	12	*****************************************************************************/
13	#pragma warning (disable:4786)	13	#pragma warning (disable:4786)
14		14
15	#include "JIEImpl.h"
16	#include "JavaClass.h"	15	#include "JavaClass.h"
		16	#include "JIEImpl.h"
		17	#include "JIEUtils.h"
		18
		19	#include "LibraryLoader.h"
		20	#include "OSA.h"
17		21
18	// first ids are reserved for threads in the prf resolution	22	// first ids are reserved for threads in the prf resolution
19	#define JIE_FIRST_METHOD_ID 0x10000	23	#define JIE_FIRST_METHOD_ID 0x10000
20		24
21	using namespace Martini::JIE;	25	using namespace Martini::JIE;
		26	using namespace Martini::OSA;
22		27
23	extern "C" JIE_API IJIE *GetJIEInstance()	28	extern "C" JIE_API IJIE *GetJIEInstance()
24	{	29	{
Lines 26-31 Link Here
26	return (IJIE*)&s_jie;	31	return (IJIE*)&s_jie;
27	}	32	}
28		33
		34
29	//////////////////////////////////////////////////////////////////////////	35	//////////////////////////////////////////////////////////////////////////
30	// class CJIE implementation	36	// class CJIE implementation
31		37
Lines 51-53 Link Here
51	}	57	}
52	return pClass;	58	return pClass;
53	}	59	}
		60
		61	void CJIE::EnableStackMapCalculation() const
		62	{
		63	TResult res = BindJpiFunctions();
		64	if (MRTE_SUCCEEDED(res))
		65	{
		66	CJieGlobals::Instance()->isStackMapCalcEnabled = true;
		67	}
		68	}
		69
		70	TResult CJIE::BindJpiFunctions() const
		71	{
		72	ILibraryLoader *pJpiLoader = LoadBistroLibrary("JPI");
		73	if (!pJpiLoader)
		74	{
		75	return MRTE_ERROR_FAIL;
		76	}
		77
		78	CJieGlobals::Instance()->pfnJPI_AttachCurrentThread =
		79	(TJpiAttachCurrentThread)pJpiLoader->GetEntry("JPI_AttachCurrentThread");
		80	if (!CJieGlobals::Instance()->pfnJPI_AttachCurrentThread)
		81	{
		82	return MRTE_ERROR_FAIL;
		83	}
		84
		85	CJieGlobals::Instance()->pfnJPI_DetachCurrentThread =
		86	(TJpiDetachCurrentThread)pJpiLoader->GetEntry("JPI_DetachCurrentThread");
		87	if (!CJieGlobals::Instance()->pfnJPI_DetachCurrentThread)
		88	{
		89	return MRTE_ERROR_FAIL;
		90	}
		91
		92	pJpiLoader->Destroy();
		93
		94	return MRTE_RESULT_OK;
		95	}

Lines 69-82 Link Here

(-)src-native/src/Martini/Infrastructure/Include/InstrumentationAdaptor.h (-9 / +12 lines)
69	*	69	*
70	* This function initializes the Instrumentation Adaptor. It is called	70	* This function initializes the Instrumentation Adaptor. It is called
71	* prior to any other Adaptor function.	71	* prior to any other Adaptor function.
72	*	72	*
73	* @param[in] pLogger : A pointer to an initialized Logger object, to be used	73	* @param[in] pLogger : A pointer to an initialized Logger object, to be used
74	* by the instrumentation adaptor for logging messages and	74	* by the instrumentation adaptor for logging messages and
75	* reporting fatal errors.	75	* reporting fatal errors.
76	* @param[in] pFilter : An optional pointer to an object implementing the	76	* @param[in] pFilter : An optional pointer to an object implementing the
77	* IEventFilter interface. The Adaptor uses this	77	* IEventFilter interface. The Adaptor uses this
78	* object to determine which elements of the class file	78	* object to determine which elements of the class file
79	* should be instrumented.	79	* should be instrumented.
		80	* @param[in] configFlags : Optional configuration flags passed to the Martini tool
		81	* during its initialization (see MPI::EConfigurationFlags)
80	*	82	*
81	* @retval MRTE_RESULT_OK Success	83	* @retval MRTE_RESULT_OK Success
82	* @retval MRTE_ERROR_FAIL Initialization error	84	* @retval MRTE_ERROR_FAIL Initialization error
Lines 84-90 Link Here
84	* by the adaptor module	86	* by the adaptor module
85	*/	87	*/
86	virtual TResult Init(Infrastructure::ILogAssert *pLogger = NULL,	88	virtual TResult Init(Infrastructure::ILogAssert *pLogger = NULL,
87	MPI::IEventFilter* pFilter = NULL) = 0;	89	MPI::IEventFilter* pFilter = NULL,
		90	MPI::BitSet configFlags = MPI::CF_NONE) = 0;
88		91
89	/**	92	/**
90	* @brief Modifies a Java class file	93	* @brief Modifies a Java class file

Lines 197-209 Link Here

(-)src-native/src/makefile.inc (+3 lines)
197	ifdef RELEASE	197	ifdef RELEASE
198	OBJDIR = release/$(PLATFORM_NAME)$(DIR_EXTENTION)	198	OBJDIR = release/$(PLATFORM_NAME)$(DIR_EXTENTION)
199	OUTDIR = $(ROOTDIR)/bin/linux/release/$(PLATFORM_NAME)$(DIR_EXTENTION)	199	OUTDIR = $(ROOTDIR)/bin/linux/release/$(PLATFORM_NAME)$(DIR_EXTENTION)
		200	PLATFORM_AND_MODE_NAME = release/$(PLATFORM_NAME)
200	else	201	else
201	ifdef RELEASE_WD	202	ifdef RELEASE_WD
202	OBJDIR = release_debug_info/$(PLATFORM_NAME)$(DIR_EXTENTION)	203	OBJDIR = release_debug_info/$(PLATFORM_NAME)$(DIR_EXTENTION)
203	OUTDIR = $(ROOTDIR)/bin/linux/release_debug_info/$(PLATFORM_NAME)$(DIR_EXTENTION)	204	OUTDIR = $(ROOTDIR)/bin/linux/release_debug_info/$(PLATFORM_NAME)$(DIR_EXTENTION)
		205	PLATFORM_AND_MODE_NAME = release_debug_info/$(PLATFORM_NAME)
204	else	206	else
205	OBJDIR = debug/$(PLATFORM_NAME)$(DIR_EXTENTION)	207	OBJDIR = debug/$(PLATFORM_NAME)$(DIR_EXTENTION)
206	OUTDIR = $(ROOTDIR)/bin/linux/debug/$(PLATFORM_NAME)$(DIR_EXTENTION)	208	OUTDIR = $(ROOTDIR)/bin/linux/debug/$(PLATFORM_NAME)$(DIR_EXTENTION)
		209	PLATFORM_AND_MODE_NAME = debug/$(PLATFORM_NAME)
207	endif	210	endif
208	endif	211	endif
209		212

Lines 46-52 Link Here

(-)src-native/src/Martini/Infrastructure/common/InstrumentationAdaptorBase.cpp (-2 / +14 lines)
46	// Default constructor	46	// Default constructor
47	//	47	//
48	CInstrumentationAdaptorBase::CInstrumentationAdaptorBase()	48	CInstrumentationAdaptorBase::CInstrumentationAdaptorBase()
49	: m_bJVMInitDone(false), m_pLogger(NULL)	49	: m_bJVMInitDone(false), m_pLogger(NULL), m_configFlags(MPI::CF_NONE)
50	{	50	{
51	}	51	}
52		52
Lines 57-78 Link Here
57	{	57	{
58	}	58	}
59		59
60	TResult CInstrumentationAdaptorBase::Init(ILogAssert *pLogger)	60	TResult CInstrumentationAdaptorBase::Init(ILogAssert pLogger / = NULL */,
		61	MPI::BitSet configFlags /* = MPI::CF_NONE */)
61	{	62	{
62	m_pLogger = pLogger;	63	m_pLogger = pLogger;
		64	m_configFlags = configFlags;
63	m_pJIE = InitJIE();	65	m_pJIE = InitJIE();
64	if (NULL == m_pJIE)	66	if (NULL == m_pJIE)
65	{	67	{
66	return MRTE_ERROR_FAIL;	68	return MRTE_ERROR_FAIL;
67	}	69	}
		70
68	return MRTE_RESULT_OK;	71	return MRTE_RESULT_OK;
69	}	72	}
70		73
71	void CInstrumentationAdaptorBase::JvmInitDone()	74	void CInstrumentationAdaptorBase::JvmInitDone()
72	{	75	{
		76	if (IsStackMapCalcEnabled())
		77	{
		78	m_pJIE->EnableStackMapCalculation();
		79	}
73	m_bJVMInitDone = true;	80	m_bJVMInitDone = true;
74	}	81	}
75		82
		83	bool CInstrumentationAdaptorBase::IsStackMapCalcEnabled()
		84	{
		85	return (m_configFlags & MPI::CF_JAVA_ENABLE_STACKMAP_CALC);
		86	}
		87
76	IJIE* CInstrumentationAdaptorBase::InitJIE()	88	IJIE* CInstrumentationAdaptorBase::InitJIE()
77	{	89	{
78	const char *JIE_DLL = "JIE";	90	const char *JIE_DLL = "JIE";