Attachment #96761 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 23-28 CFG=BCIEng - Win32 Debug Link Here

(-)BCIEng.dsp (-1 / +3 lines)
23		23
24	# Begin Project	24	# Begin Project
25	# PROP AllowPerConfigDependencies 0	25	# PROP AllowPerConfigDependencies 0
		26	# PROP Scc_ProjName ""
		27	# PROP Scc_LocalPath ""
26	CPP=cl.exe	28	CPP=cl.exe
27	RSC=rc.exe	29	RSC=rc.exe
28		30
Lines 62-68 LIB32=link.exe -lib Link Here
62	# PROP Intermediate_Dir "Debug"	64	# PROP Intermediate_Dir "Debug"
63	# PROP Target_Dir ""	65	# PROP Target_Dir ""
64	# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c	66	# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
65	# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\Common" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c	67	# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\Common" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /FR /YX /FD /GZ /c
66	# ADD BASE RSC /l 0x409 /d "_DEBUG"	68	# ADD BASE RSC /l 0x409 /d "_DEBUG"
67	# ADD RSC /l 0x409 /d "_DEBUG"	69	# ADD RSC /l 0x409 /d "_DEBUG"
68	BSC32=bscmake.exe	70	BSC32=bscmake.exe

Lines 3-9 Microsoft Developer Studio Workspace Fil Link Here

(-)BCIEng.dsw (-8 / +8 lines)
3		3
4	###############################################################################	4	###############################################################################
5		5
6	Project: "BCIEng"=.\BCIEng.dsp - Package Owner=<4>	6	Project: "BCIEng"=".\BCIEng.dsp" - Package Owner=<4>
7		7
8	Package=<5>	8	Package=<5>
9	{{{	9	{{{
Lines 15-21 Package=<4> Link Here
15		15
16	###############################################################################	16	###############################################################################
17		17
18	Project: "BCIEngJ"=.\BCIEngJ\BCIEngJ.dsp - Package Owner=<4>	18	Project: "BCIEngJ"=".\BCIEngJ\BCIEngJ.dsp" - Package Owner=<4>
19		19
20	Package=<5>	20	Package=<5>
21	{{{	21	{{{
Lines 30-36 Package=<4> Link Here
30		30
31	###############################################################################	31	###############################################################################
32		32
33	Project: "BCIEngProbe"=.\BCIEngProbe\BCIEngProbe.dsp - Package Owner=<4>	33	Project: "BCIEngProbe"=".\BCIEngProbe\BCIEngProbe.dsp" - Package Owner=<4>
34		34
35	Package=<5>	35	Package=<5>
36	{{{	36	{{{
Lines 48-54 Package=<4> Link Here
48		48
49	###############################################################################	49	###############################################################################
50		50
51	Project: "BciEngJTest"=.\BCIEngJ\BciEngJTest\BciEngJTest.dsp - Package Owner=<4>	51	Project: "BciEngJTest"=".\BCIEngJ\BciEngJTest\BciEngJTest.dsp" - Package Owner=<4>
52		52
53	Package=<5>	53	Package=<5>
54	{{{	54	{{{
Lines 60-66 Package=<4> Link Here
60		60
61	###############################################################################	61	###############################################################################
62		62
63	Project: "JClassStat"=..\JClass\JClassStat.dsp - Package Owner=<4>	63	Project: "JClassStat"="..\JClass\JClassStat.dsp" - Package Owner=<4>
64		64
65	Package=<5>	65	Package=<5>
66	{{{	66	{{{
Lines 72-78 Package=<4> Link Here
72		72
73	###############################################################################	73	###############################################################################
74		74
75	Project: "JDump"=..\JDump\JDump.dsp - Package Owner=<4>	75	Project: "JDump"="..\JDump\JDump.dsp" - Package Owner=<4>
76		76
77	Package=<5>	77	Package=<5>
78	{{{	78	{{{
Lines 90-96 Package=<4> Link Here
90		90
91	###############################################################################	91	###############################################################################
92		92
93	Project: "ProbeInstrumenter"=.\BCIEngProbe\ProbeInstrumenter\ProbeInstrumenter.dsp - Package Owner=<4>	93	Project: "ProbeInstrumenter"=".\BCIEngProbe\ProbeInstrumenter\ProbeInstrumenter.dsp" - Package Owner=<4>
94		94
95	Package=<5>	95	Package=<5>
96	{{{	96	{{{
Lines 105-111 Package=<4> Link Here
105		105
106	###############################################################################	106	###############################################################################
107		107
108	Project: "ProbeUnitTests"=.\ProbeUnitTests\ProbeUnitTests.dsp - Package Owner=<4>	108	Project: "ProbeUnitTests"=".\ProbeUnitTests\ProbeUnitTests.dsp" - Package Owner=<4>
109		109
110	Package=<5>	110	Package=<5>
111	{{{	111	{{{

Lines 152-157 typedef void* pbcieng_t; Link Here

(-)BCIEngInterface.h (+2 lines)
152	_BCIENGINTERFACE_EXT_REF unsigned Initialize(pbcieng_t i_pbcieng, const char* i_pchOptions, size_t i_cbOptions);	152	_BCIENGINTERFACE_EXT_REF unsigned Initialize(pbcieng_t i_pbcieng, const char* i_pchOptions, size_t i_cbOptions);
153	_BCIENGINTERFACE_EXT_REF unsigned Instrument(pbcieng_t i_pbcieng, void* i_pInClass, size_t i_cbInClass,	153	_BCIENGINTERFACE_EXT_REF unsigned Instrument(pbcieng_t i_pbcieng, void* i_pInClass, size_t i_cbInClass,
154	void** o_ppOutClass, size_t* o_pcbOutClass);	154	void** o_ppOutClass, size_t* o_pcbOutClass);
		155	_BCIENGINTERFACE_EXT_REF unsigned Instrument2(pbcieng_t i_pbcieng, void* i_pInClass, size_t i_cbInClass,
		156	void** o_ppOutClass, size_t* o_pcbOutClass, void ()(void **));
155	_BCIENGINTERFACE_EXT_REF unsigned SetAllocator(pbcieng_t i_pbcieng, pfnMalloc_t i_pfnMalloc);	157	_BCIENGINTERFACE_EXT_REF unsigned SetAllocator(pbcieng_t i_pbcieng, pfnMalloc_t i_pfnMalloc);
156	_BCIENGINTERFACE_EXT_REF unsigned SetCallback(pbcieng_t i_pbcieng, pfnCallback_t i_pfnCallback, unsigned i_uFlags);	158	_BCIENGINTERFACE_EXT_REF unsigned SetCallback(pbcieng_t i_pbcieng, pfnCallback_t i_pfnCallback, unsigned i_uFlags);
157		159

Lines 132-138 public: Link Here

(-)Module.h (-1 / +1 lines)
132		132
133	virtual const vector<string>& GetSourceFileNames() = 0;	133	virtual const vector<string>& GetSourceFileNames() = 0;
134		134
135	virtual void Parse()=0;	135	virtual int Parse()=0;
136	virtual void Emit();	136	virtual void Emit();
137		137
138	CMethods* GetMethods(){return m_pMethods;}	138	CMethods* GetMethods(){return m_pMethods;}

Lines 41-47 RSC=rc.exe Link Here

(-)BCIEngJ/BCIEngJ.dsp (-2 / +15 lines)
41	# PROP Intermediate_Dir "Release"	41	# PROP Intermediate_Dir "Release"
42	# PROP Target_Dir ""	42	# PROP Target_Dir ""
43	# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c	43	# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
44	# ADD CPP /nologo /MT /W3 /GX /Zi /O2 /I "..\\" /I "..\..\jclass" /I "..\..\..\sun" /I "..\..\common" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c	44	# ADD CPP /nologo /MT /W3 /GX /Zi /O2 /I "..\..\common" /I "${JAVA_HOME}\include" /I "${JAVA_HOME}\include\win32" /I "${HARMONY_VERIFIER}\open\include" /I "${HARMONY_VERIFIER}\verifier-3363\x_verifier" /I "%HARMONY_VERIFIER%\include" /I "..\..\Common" /I "$(JAVA_HOME)\include" /I "$(JAVA_HOME)\include\win32" /I "..\\" /I "..\..\jclass" /I "..\..\..\sun" /I "..\..\..\..\..\org.apache.harmony_vmcore_verifier\include" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /FD /c
45	# ADD BASE RSC /l 0x409 /d "NDEBUG"	45	# ADD BASE RSC /l 0x409 /d "NDEBUG"
46	# ADD RSC /l 0x409 /d "NDEBUG"	46	# ADD RSC /l 0x409 /d "NDEBUG"
47	BSC32=bscmake.exe	47	BSC32=bscmake.exe
Lines 64-70 LIB32=link.exe -lib Link Here
64	# PROP Intermediate_Dir "Debug"	64	# PROP Intermediate_Dir "Debug"
65	# PROP Target_Dir ""	65	# PROP Target_Dir ""
66	# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c	66	# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
67	# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\Common" /I "..\\" /I "..\..\jclass" /I "..\..\..\sun" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /FR /YX /FD /GZ /c	67	# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\Common" /I "$(JAVA_HOME)\include" /I "$(JAVA_HOME)\include\win32" /I "..\\" /I "..\..\jclass" /I "..\..\..\sun" /I "..\..\..\..\..\org.apache.harmony_vmcore_verifier\include" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /FR /FD /GZ /c
		68	# SUBTRACT CPP /YX
68	# ADD BASE RSC /l 0x409 /d "_DEBUG"	69	# ADD BASE RSC /l 0x409 /d "_DEBUG"
69	# ADD RSC /l 0x409 /d "_DEBUG"	70	# ADD RSC /l 0x409 /d "_DEBUG"
70	BSC32=bscmake.exe	71	BSC32=bscmake.exe
Lines 85-90 LIB32=link.exe -lib Link Here
85	# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"	86	# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
86	# Begin Source File	87	# Begin Source File
87		88
		89	SOURCE=.\class_interface.cpp
		90	# End Source File
		91	# Begin Source File
		92
88	SOURCE=.\ExtRefJ_Interface.cpp	93	SOURCE=.\ExtRefJ_Interface.cpp
89	# End Source File	94	# End Source File
90	# Begin Source File	95	# Begin Source File
Lines 105-110 SOURCE=.\ModuleJ.cpp Link Here
105	# PROP Default_Filter "h;hpp;hxx;hm;inl"	110	# PROP Default_Filter "h;hpp;hxx;hm;inl"
106	# Begin Source File	111	# Begin Source File
107		112
		113	SOURCE=.\class_inerface_int.h
		114	# End Source File
		115	# Begin Source File
		116
		117	SOURCE=.\class_interface_x.h
		118	# End Source File
		119	# Begin Source File
		120
108	SOURCE=.\ExtRefJ_Interface.h	121	SOURCE=.\ExtRefJ_Interface.h
109	# End Source File	122	# End Source File
110	# Begin Source File	123	# Begin Source File

Lines 34-41 Link Here

(-)BCIEngJ/ModuleJ.cpp (-6 / +104 lines)
34	#include <iostream>	34	#include <iostream>
35	#endif	35	#endif
36		36
37	static CInsSetJ InsSet;	37	#include <assert.h>
38		38
		39	static CInsSetJ InsSet;
39	//==============================================================================	40	//==============================================================================
40	// CModuleJ implementation	41	// CModuleJ implementation
41	//------------------------------------------------------------------------------	42	//------------------------------------------------------------------------------
Lines 51-56 CModuleJ::CModuleJ() Link Here
51	m_fDestroyClass = false;	52	m_fDestroyClass = false;
52	m_fAccessFlags = 0;	53	m_fAccessFlags = 0;
53	m_sourceFileNamesPopulated = false;	54	m_sourceFileNamesPopulated = false;
		55	m_verificationContext = NULL;
		56	m_classHandler = NULL;
		57	m_methodContexts = NULL;
		58	m_use_stack_map_recalculation = false;
54	}	59	}
55		60
56	//------------------------------------------------------------------------------	61	//------------------------------------------------------------------------------
Lines 63-68 CModuleJ::~CModuleJ() Link Here
63	{	68	{
64	delete m_pClass;	69	delete m_pClass;
65	}	70	}
		71	if (m_verificationContext != NULL) {
		72	free_verification_context(m_verificationContext);
		73	m_verificationContext = NULL;
		74	}
		75	if (m_classHandler != NULL) {
		76	/XXX: free here/
		77	m_classHandler = NULL;
		78	}
		79	if (m_methodContexts != NULL) {
		80	free(m_methodContexts);
		81	m_methodContexts = NULL;
		82	}
66	}	83	}
67		84
68	//------------------------------------------------------------------------------	85	//------------------------------------------------------------------------------
Lines 83-88 CModuleJ::Open(CSTR i_szName) Link Here
83	m_fDestroyClass = true;	100	m_fDestroyClass = true;
84	FileStreamIn.Close();	101	FileStreamIn.Close();
85	Verify();	102	Verify();
		103
86	}	104	}
87		105
88	//------------------------------------------------------------------------------	106	//------------------------------------------------------------------------------
Lines 184-190 CModuleJ::CreateMethod(u2 i_u2AccFlags, Link Here
184	}	202	}
185		203
186	//------------------------------------------------------------------------------	204	//------------------------------------------------------------------------------
187	void	205	int
188	CModuleJ::Parse()	206	CModuleJ::Parse()
189	{	207	{
190	CJMethods* pMethods = m_pClass->GetMethods();	208	CJMethods* pMethods = m_pClass->GetMethods();
Lines 227-238 CModuleJ::Parse() Link Here
227	}	245	}
228	m_pMethods->push_back(pMtd);	246	m_pMethods->push_back(pMtd);
229	}	247	}
		248
		249	vf_Result status;
		250	int ind;
		251	if (GetClassBuilder().GetMajorVersion() >= 50
		252	&& IsStackMapCalculationUsed()) {
		253	m_classHandler = get_class_handler_from_builder(this);
		254	assert(m_classHandler);
		255	m_verificationContext = allocate_verification_context(m_classHandler);
		256	assert(m_verificationContext);
		257	m_methodContexts = (method_handler )malloc(m_pMethods->size() sizeof(method_handler));
		258	assert(m_methodContexts);
		259	memset(m_methodContexts, 0, m_pMethods->size() * sizeof(method_handler));
		260	fprintf(stderr, "class : %s is java6 compiled\n", m_strName.c_str());
		261	}
230		262
231	CMethods::iterator iterm;	263	CMethods::iterator iterm;
232	for(iterm = m_pMethods->begin(); iterm < m_pMethods->end(); iterm++)	264	for(iterm = m_pMethods->begin(), ind = 0; iterm < m_pMethods->end(); iterm++, ind++)
233	{	265	{
234	(*iterm)->Parse();	266	(*iterm)->Parse();
		267	if (GetClassBuilder().GetMajorVersion() >= 50
		268	&& IsStackMapCalculationUsed()) {
		269	//malloc(5);
		270	m_methodContexts[ind] = get_method_handler_for_cmethod(*iterm);
		271	//malloc(50);
		272	assert(m_methodContexts[ind]);
		273	status = init_verification_context_for_method(m_methodContexts[ind], m_verificationContext);
		274	malloc(50);
		275	if (status != VF_OK) {
		276	fprintf(stderr, "class was skiped: %s\n", m_strName.c_str());
		277	return (1); /skip/
		278	}
		279	fprintf(stderr, "class was instrumented: %s\n", m_strName.c_str());
		280	((CMethodJ )(iterm))->SetMethodHandler(m_methodContexts[ind]);
		281	}
235	}	282	}
		283	return (0);
236	}	284	}
237		285
238	//------------------------------------------------------------------------------	286	//------------------------------------------------------------------------------
Lines 385-392 CMethodJ::Emit() Link Here
385	m_pMtdExTable->Emit();	433	m_pMtdExTable->Emit();
386		434
387	//-------	435	//-------
388	// Loop over instructions and patch the local variable info table	436	// Loop over instructions and patch the local variable info table,
		437	// local variable type table (Java 5.0) and stack map table (Java 6.0)
389	//	438	//
		439
		440
390		441
391	// Local variable table LVT	442	// Local variable table LVT
392	CLocalVariableTableAttribute* pLclAttr = m_pCodeAttr->GetLocalVariables();	443	CLocalVariableTableAttribute* pLclAttr = m_pCodeAttr->GetLocalVariables();
Lines 403-408 CMethodJ::Emit() Link Here
403	CLocalVariableTypeTable LclTypeTableSav;	454	CLocalVariableTypeTable LclTypeTableSav;
404	CLocalVariableTypeTable::iterator itrLclType, itrLclTypeSav; // LVTT Iterator	455	CLocalVariableTypeTable::iterator itrLclType, itrLclTypeSav; // LVTT Iterator
405		456
		457	// The smtNull variable is for reference initialization in case the method does not have
		458	// a Stack Map Table attribute
		459	CStackMapTable smtNull;
		460	CStackMapTableAttribute* pSmtAttr = m_pCodeAttr->GetStackMaps();
		461	CStackMapTable& StackMapTable = pSmtAttr?pSmtAttr->GetStackMapTable():smtNull;
		462	CStackMapTable::iterator itrStackMapFrame = StackMapTable.begin();
		463
406	CInsBlocks::iterator iterBlocks;	464	CInsBlocks::iterator iterBlocks;
407	IP_t ip = 0;	465	IP_t ip = 0;
408		466
Lines 458-463 CMethodJ::Emit() Link Here
458	}	516	}
459	}	517	}
460	}	518	}
		519
		520	// Scan for a relevant entry in the Stack Map Table and fix it
		521	while (itrStackMapFrame != StackMapTable.end()
		522	&& (*itrStackMapFrame)->GetByteCodeOffset() < ipOrig)
		523	{
		524	++itrStackMapFrame;
		525	}
		526	if (itrStackMapFrame != StackMapTable.end()
		527	&& (*itrStackMapFrame)->GetByteCodeOffset() == ipOrig)
		528	{
		529	(*itrStackMapFrame)->SetByteCodeOffset(ip);
		530	}
461		531
462	// Advance ip	532	// Advance ip
463	ip += (*iterIns)->GetSize(ip);	533	ip += (*iterIns)->GetSize(ip);
Lines 503-513 CMethodJ::Emit() Link Here
503	}	573	}
504	}	574	}
505	}	575	}
		576	// Replace the method body
		577	m_pCodeAttr->SetCode(m_pBody->GetCodeSize(), m_pBody->GiveAvayCode());
506		578
		579	// Calculate new stack depth
507	CalcStackDepth();	580	CalcStackDepth();
508		581
509	// Replace the method body	582	if (((CModuleJ *)GetModule())->GetClassBuilder().GetMajorVersion() >= 50
510	m_pCodeAttr->SetCode(m_pBody->GetCodeSize(), m_pBody->GiveAvayCode());	583	&& ((CModuleJ *)GetModule())->IsStackMapCalculationUsed()) {
		584
		585	u1 *tbl;
		586	vf_Result status;
		587	status = recompute_stackmaptable((uint8 *)&tbl, m_methodHandler, ((CModuleJ )GetModule())->GetVerificationContext());
		588	if (status != VF_OK) {
		589	__asm {int 3}
		590	}
		591	else {
		592	//CStackMapTable smt (tbl);
		593	CStackMapTableAttribute* smta = GetCodeAttribute()->GetOrCreateStackMaps();
		594	if (tbl != NULL) {
		595	smta->RereadFromBuffer(tbl); //skiping name
		596	smta->GetStackMapTable().AdjustOffsetDeltas();
		597	}
		598	}
		599	}
		600	// Final Stack Map Table handling: adjust offset deltas
		601	//StackMapTable.AdjustOffsetDeltas();
		602
		603
		604
511		605
512	}	606	}
513		607
Lines 623-633 CMtdExTableJ::Emit() Link Here
623	{	717	{
624	ipRealEnd = ipIns + pi->GetSize();	718	ipRealEnd = ipIns + pi->GetSize();
625	bDone = true;	719	bDone = true;
		720	//assert(ipStart != ipRealEnd);
		721	//(*itrEx)->SetStart(ipStart);
		722	//(*itrEx)->SetEnd(ipRealEnd);
626	break;	723	break;
627	}	724	}
628	}	725	}
629	}	726	}
630	}	727	}
		728
631	CJException jex = CJException(uType, ipStart, ipRealEnd, ipHandler);	729	CJException jex = CJException(uType, ipStart, ipRealEnd, ipHandler);
632	extblj.push_back(jex);	730	extblj.push_back(jex);
633	}	731	}





#include "Module.h"
#include "JClassBuilder.h"
#include "class_inerface_int.h"

class CModuleJ;
class CMethodJ;

	virtual void	Open(CJClassBuilder* io_pClass, bool i_fDestroyClass = false);
	virtual void	AddExtRef(CExtRef& i_ExtRef);
	virtual void	AddStringAttrib(CSTR i_szName, CSTR i_szValue);
	virtual int	Parse();
	virtual void	Emit();

	void	Emit(CJStream& i_jstream);	// Java specific emission
	CJClassFile&	GetClass();
	CJClassBuilder& GetClassBuilder();
	class_handler GetClassHandler() {return m_classHandler;}
	verification_context GetVerificationContext(){return m_verificationContext;}

	virtual const vector<string>& GetSourceFileNames();

	// Module modification methods
	CCPFieldrefInfo*	CreateFieldRef(u2 i_u2AccFlags, CSTR i_szName, CJavaType i_jtype);
	CMethodJ*			CreateMethod(u2 i_u2AccFlags, CSTR i_szName, CSTR i_szSignature);
	bool IsStackMapCalculationUsed() const {return m_use_stack_map_recalculation;}
	void UseStackMapCalculation(bool a_use_stack_map_recalculation) {m_use_stack_map_recalculation = a_use_stack_map_recalculation;}
protected:

private:

	// Storage in support of GetSourceFileNames:
	vector<string>	m_sourceFileNames;
	bool			m_sourceFileNamesPopulated;
	verification_context m_verificationContext; /*verifier context for support java 6.0 and latter*/
	class_handler m_classHandler; /* class descriptor used for verification needs(recalculations) introduced in java 6.0*/
	method_handler *m_methodContexts; /*collections of method handlers*/
	bool m_use_stack_map_recalculation;
};

//==============================================================================

		m_strSignature = i_szSignature;
		m_pCodeAttr = i_pCodeAttr;
		m_u2AccessFlags = i_u2AccessFlags;
		

		// Set the "hasThis" attribute, which is accessible to all CMethod users
		SetHasThis(!(m_u2AccessFlags & ACC_STATIC));

	CSTR	GetSignature() const {return m_strSignature.c_str();}
	bool IsAbstract() { return ((m_u2AccessFlags & ACC_ABSTRACT) != 0); };
    u2 GetAccessFlags() const { return m_u2AccessFlags; }
	void SetMethodHandler(method_handler i_methodHandler) {m_methodHandler = i_methodHandler;}
	method_handler GetMethodHandler() {return m_methodHandler;}

	virtual void Parse();
	virtual void Emit();

	CCodeAttribute*		m_pCodeAttr;		// Code attribute from CJClassFile
	u2					m_u2AccessFlags;	// Method access flags
	IP_t				m_origCodeLength;	// Saved code length from Parse to Emit
	method_handler		m_methodHandler;
};



Lines 20-25 Link Here

(-)BCIEngProbe/BCIEngProbe.cpp (-5 / +21 lines)
20	#pragma convert(819) /* see comment in CommonDef.h about this */	20	#pragma convert(819) /* see comment in CommonDef.h about this */
21	#endif	21	#endif
22		22
		23	#include <assert.h>
		24
23	#ifdef WIN32	25	#ifdef WIN32
24	#pragma warning(disable:4786)	26	#pragma warning(disable:4786)
25	#endif	27	#endif
Lines 32-37 Link Here
32	#include "BCIEngProbe.h" // BCI Engine for Probe Kit	34	#include "BCIEngProbe.h" // BCI Engine for Probe Kit
33	#include "BCIEngInterface.h" // for callback message number defines	35	#include "BCIEngInterface.h" // for callback message number defines
34		36
		37
35	#include <stdio.h> // for sprintf on Linux	38	#include <stdio.h> // for sprintf on Linux
36	#ifdef MVS	39	#ifdef MVS
37	# include <unistd.h> /* for __etoa */	40	# include <unistd.h> /* for __etoa */
Lines 1830-1839 CBCIEngProbe::Instrument(void* i_pInClas Link Here
1830	// Starting with the call to Open, we don't need to delete pClass any more:	1833	// Starting with the call to Open, we don't need to delete pClass any more:
1831	// The module owns it.	1834	// The module owns it.
1832	CModuleJ* pModuleJ = new CModuleJ;	1835	CModuleJ* pModuleJ = new CModuleJ;
		1836	pModuleJ->UseStackMapCalculation(m_use_external_verifier);
1833	pModuleJ->Open(pClass, true);	1837	pModuleJ->Open(pClass, true);
1834	pModuleJ->SetAccessFlags(pClass->GetAccessFlags());	1838	pModuleJ->SetAccessFlags(pClass->GetAccessFlags());
1835	pModuleJ->Parse();	1839	if (pModuleJ->Parse() != 0) {
1836		1840	*o_pcbOutClass = i_cbInClass;
		1841	*o_ppOutClass = i_pInClass;
		1842	delete pClass;
		1843	return false;
		1844	}
		1845
1837	// If we were asked to, then dump the module before and after instrumentation	1846	// If we were asked to, then dump the module before and after instrumentation
1838	const char *dump_output_file;	1847	const char *dump_output_file;
1839	if ((dump_output_file = getenv("PROBEKIT_DUMP_FILE")) != NULL) {	1848	if ((dump_output_file = getenv("PROBEKIT_DUMP_FILE")) != NULL) {
Lines 1845-1850 CBCIEngProbe::Instrument(void* i_pInClas Link Here
1845	output_stream << "=========== DUMP BEFORE INSTRUMENTATION" << endl;	1854	output_stream << "=========== DUMP BEFORE INSTRUMENTATION" << endl;
1846	pModuleJ->Dump(output_stream);	1855	pModuleJ->Dump(output_stream);
1847		1856
		1857
1848	#if defined(MVS) \|\| defined(__OS400__)	1858	#if defined(MVS) \|\| defined(__OS400__)
1849	/* On EBCDIC systems, convert ASCII to EBCDIC */	1859	/* On EBCDIC systems, convert ASCII to EBCDIC */
1850	char* data = output_stream.str();	1860	char* data = output_stream.str();
Lines 1864-1870 CBCIEngProbe::Instrument(void* i_pInClas Link Here
1864	// to this module, but we still ran callsite probes against this	1874	// to this module, but we still ran callsite probes against this
1865	// module and maybe we didn't actually do anything.	1875	// module and maybe we didn't actually do anything.
1866	// In that case we should set out == in and return without calling emit.	1876	// In that case we should set out == in and return without calling emit.
1867
1868	pModuleJ->Emit();	1877	pModuleJ->Emit();
1869		1878
1870	// Tell the client that's driving us that we did something to this module	1879	// Tell the client that's driving us that we did something to this module
Lines 1882-1887 CBCIEngProbe::Instrument(void* i_pInClas Link Here
1882	#else	1891	#else
1883	ofstream output_stream(dump_output_file, ios::app);	1892	ofstream output_stream(dump_output_file, ios::app);
1884	#endif	1893	#endif
		1894
1885	output_stream << "=========== DUMP AFTER INSTRUMENTATION" << endl;	1895	output_stream << "=========== DUMP AFTER INSTRUMENTATION" << endl;
1886	pModuleJ->Dump(output_stream);	1896	pModuleJ->Dump(output_stream);
1887		1897
Lines 1898-1903 CBCIEngProbe::Instrument(void* i_pInClas Link Here
1898	}	1908	}
1899		1909
1900	*o_pcbOutClass = pClass->GetSize();	1910	*o_pcbOutClass = pClass->GetSize();
		1911	if (m_pfnMalloc == NULL) {
		1912	/skipping/
		1913	*o_pcbOutClass = i_cbInClass;
		1914	*o_ppOutClass = i_pInClass;
		1915	delete pClass;
		1916	return false;
		1917	}
1901	o_ppOutClass = m_pfnMalloc(o_pcbOutClass);	1918	o_ppOutClass = m_pfnMalloc(o_pcbOutClass);
1902		1919
1903	CJMemStream OutStream; // Memory stream	1920	CJMemStream OutStream; // Memory stream
Lines 1998-2004 CBCIEngProbe::Instrument(CModule* i_pmod Link Here
1998	{	2015	{
1999	InstrumentMethod(*itrMeth);	2016	InstrumentMethod(*itrMeth);
2000	}	2017	}
2001
2002	// Process any staticInitializer fragments that matched this class,	2018	// Process any staticInitializer fragments that matched this class,
2003	// and default initializers for staticField elements in probes that matched.	2019	// and default initializers for staticField elements in probes that matched.
2004	HandleStaticInitializers(pmodj);	2020	HandleStaticInitializers(pmodj);
Lines 3179-3185 CBCIEngProbe::InstrumentMethod(CMethod* Link Here
3179	{	3195	{
3180	return;	3196	return;
3181	}	3197	}
3182		3198
3183	// Allow the client that's driving us to veto instrumentation of this module	3199	// Allow the client that's driving us to veto instrumentation of this module
3184	if (NULL != m_pfnCallback &&	3200	if (NULL != m_pfnCallback &&
3185	(m_wCBFlags & BCIENGINTERFACE_CALLBACK_METHOD) &&	3201	(m_wCBFlags & BCIENGINTERFACE_CALLBACK_METHOD) &&




# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "BCIENGPROBE_EXPORTS" /YX /FD /c
# ADD CPP /nologo /MT /W3 /GX /Zd /O2 /I "..\..\..\..\..\verifier\include" /I "..\..\..\..\..\verifier\open\include" /I "..\..\..\..\..\harmony-verifier\include" /I "..\..\..\..\..\harmony-verifier\open\include" /I "..\..\..\..\..\recomp" /I "..\..\..\..\..\harmony-verifier\verifier-3363\x_verifier" /I "$(JAVA_HOME)\include" /I "$(JAVA_HOME)\include\win32" /I "..\..\BCIEng\\" /I "..\..\BCIEng\BCIEngJ" /I "..\..\JClass" /I "..\..\common" /I "..\..\..\..\..\org.apache.harmony_vmcore_verifier\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "VERIFIER_STANDALONE" /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"

# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
# ADD LINK32 bciengj.lib kernel32.lib verifier-ext.lib /nologo /dll /debug /machine:I386 /libpath:"..\..\..\bci\jclass\release" /libpath:"..\..\..\bci\bcieng\bciengj\release" /libpath:"..\..\..\..\..\org.apache.harmony_vmcore_verifier\lib\win\IA-32"

!ELSEIF  "$(CFG)" == "BCIEngProbe - Win32 Debug"


# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "BCIENGPROBE_EXPORTS" /YX /FD /GZ /c
# ADD CPP /nologo /MDd /W3 /GX /Zd /Od /I "$(JAVA_HOME)\include" /I "$(JAVA_HOME)\include\win32" /I "..\..\BCIEng\\" /I "..\..\BCIEng\BCIEngJ" /I "..\..\JClass" /I "..\..\common" /I "..\..\..\..\..\org.apache.harmony_vmcore_verifier\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "VERIFIER_STANDALONE" /FR /YX /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 user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
# ADD LINK32 verifier.lib jvm.lib bciengj.lib kernel32.lib verifier-ext.lib /nologo /dll /incremental:no /debug /machine:I386 /out:"Debug/BCIEngProbe.dll " /pdbtype:sept /libpath:"..\..\..\bci\jclass\debug" /libpath:"..\..\..\bci\bcieng\bciengj\debug" /libpath:"..\..\..\..\..\harmony-verifier\verifier\verifier_6\verifier\debug" /libpath:"C:\jrockit-jdk1.6.0_02\lib" /libpath:"..\..\..\..\..\org.apache.harmony_vmcore_verifier\lib\win\IA-32"
# SUBTRACT LINK32 /verbose

!ENDIF 


Lines 504-509 private: Link Here

(-)BCIEngProbe/BCIEngProbe.h (+2 lines)
504	// These fields are reset and reused for each instrumented method	504	// These fields are reset and reused for each instrumented method
505	IP_t m_ipFinally; // Finally wrapper label	505	IP_t m_ipFinally; // Finally wrapper label
506	IP_t m_ipCatchAll; // catch-all wrapper label	506	IP_t m_ipCatchAll; // catch-all wrapper label
		507	friend class CBCIEngProbeInterface;
		508	bool m_use_external_verifier;
507	};	509	};
508		510
509	#endif // defined _BCIENGPROBE_H_	511	#endif // defined _BCIENGPROBE_H_

Lines 20-25 Link Here

(-)BCIEngProbe/BCIEngProbeInterface.cpp (+31 lines)
20	#pragma convert(819) /* see comment in CommonDef.h about this */	20	#pragma convert(819) /* see comment in CommonDef.h about this */
21	#endif	21	#endif
22		22
		23	#include <assert.h>
		24
23	#ifdef MVS	25	#ifdef MVS
24	#include <unistd.h> /* for __atoe */	26	#include <unistd.h> /* for __atoe */
25	#endif	27	#endif
Lines 37-42 Link Here
37		39
38	#define TOK_WHITESPACE " \t"	40	#define TOK_WHITESPACE " \t"
39		41
		42	int g_use_verifier;
40	//------------------------------------------------------------------------------	43	//------------------------------------------------------------------------------
41	inline static unsigned ExceptionToError(CBCIEngProbeInterfaceException& ex)	44	inline static unsigned ExceptionToError(CBCIEngProbeInterfaceException& ex)
42	{	45	{
Lines 341-346 CBCIEngProbeInterface::Initialize(const Link Here
341		344
342	}	345	}
343		346
		347	//------------------------------------------------------------------------------
		348	void
		349	CBCIEngProbeInterface::UseStackMapRecalculation(bool a_use_recalculation)
		350	{
		351	m_peng.m_use_external_verifier = a_use_recalculation;
		352	}
344		353
345	//------------------------------------------------------------------------------	354	//------------------------------------------------------------------------------
346	void	355	void
Lines 439-444 unsigned Instrument(pbcieng_t i_pbcieng, Link Here
439	try	448	try
440	{	449	{
441	CBCIEngProbeInterface* peng = (CBCIEngProbeInterface*)i_pbcieng;	450	CBCIEngProbeInterface* peng = (CBCIEngProbeInterface*)i_pbcieng;
		451	peng->UseStackMapRecalculation(false);
		452	peng->Instrument(i_pInClass, i_cbInClass, o_ppOutClass, o_pcbOutClass);
		453	}
		454	catch (CBCIEngProbeInterfaceException& ex)
		455	{
		456	uErr = ExceptionToError(ex);
		457	}
		458	return uErr;
		459	}
		460
		461	//------------------------------------------------------------------------------
		462	unsigned Instrument2(pbcieng_t i_pbcieng, void* i_pInClass, size_t i_cbInClass,
		463	void** o_ppOutClass, size_t* o_pcbOutClass, void (pEnv)(void **))
		464	{
		465	unsigned uErr = 0;
		466	initialize_dynamic(pEnv);
		467	try
		468	{
		469
		470	CBCIEngProbeInterface* peng = (CBCIEngProbeInterface*)i_pbcieng;
		471	peng->UseStackMapRecalculation(true);
442	peng->Instrument(i_pInClass, i_cbInClass, o_ppOutClass, o_pcbOutClass);	472	peng->Instrument(i_pInClass, i_cbInClass, o_ppOutClass, o_pcbOutClass);
443	}	473	}
444	catch (CBCIEngProbeInterfaceException& ex)	474	catch (CBCIEngProbeInterfaceException& ex)
Lines 453-458 unsigned SetAllocator(pbcieng_t i_pbcien Link Here
453	{	483	{
454	unsigned uErr = 0;	484	unsigned uErr = 0;
455	CBCIEngProbeInterface* peng = (CBCIEngProbeInterface*)i_pbcieng;	485	CBCIEngProbeInterface* peng = (CBCIEngProbeInterface*)i_pbcieng;
		486	//assert(i_pfnMalloc);
456	peng->SetAllocator(i_pfnMalloc);	487	peng->SetAllocator(i_pfnMalloc);
457	return uErr;	488	return uErr;
458	}	489	}

Lines 85-90 public: Link Here

(-)BCIEngProbe/BCIEngProbeInterface.h (+3 lines)
85		85
86	private:	86	private:
87	CBCIEngProbe m_peng;	87	CBCIEngProbe m_peng;
		88	void UseStackMapRecalculation(bool a_use_recalculation);
		89	friend unsigned Instrument(pbcieng_t, void, size_t , void* , size_t* );
		90	friend unsigned Instrument2(pbcieng_t, void, size_t , void* , size_t, void (f)(void *));
88	};	91	};
89		92
90	//------------------------------------------------------------------------------	93	//------------------------------------------------------------------------------

Lines 42-48 RSC=rc.exe Link Here

(-)BCIEngProbe/ProbeInstrumenter/ProbeInstrumenter.dsp (-2 / +2 lines)
42	# PROP Ignore_Export_Lib 0	42	# PROP Ignore_Export_Lib 0
43	# PROP Target_Dir ""	43	# PROP Target_Dir ""
44	# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c	44	# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
45	# ADD CPP /nologo /W3 /GX /Zi /O2 /I "..\..\..\Common" /I "..\..\..\jclass" /I "..\..\..\bcieng" /I "..\..\..\bcieng\bciengj" /I ".." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FR"..\Release\\" /YX /FD /c	45	# ADD CPP /nologo /W3 /GX /Zi /O2 /I "..\..\..\..\org.apache.harmony_vmcore_verifier\include" /I "..\..\..\Common" /I "..\..\..\jclass" /I "..\..\..\bcieng" /I "..\..\..\bcieng\bciengj" /I ".." /I "..\..\..\..\..\..\org.apache.harmony_vmcore_verifier\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FR"..\Release\\" /YX /FD /c
46	# ADD BASE RSC /l 0x409 /d "NDEBUG"	46	# ADD BASE RSC /l 0x409 /d "NDEBUG"
47	# ADD RSC /l 0x409 /d "NDEBUG"	47	# ADD RSC /l 0x409 /d "NDEBUG"
48	BSC32=bscmake.exe	48	BSC32=bscmake.exe
Lines 66-72 LINK32=link.exe Link Here
66	# PROP Ignore_Export_Lib 0	66	# PROP Ignore_Export_Lib 0
67	# PROP Target_Dir ""	67	# PROP Target_Dir ""
68	# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c	68	# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
69	# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\Common" /I "..\..\..\jclass" /I "..\..\..\bcieng" /I "..\..\..\bcieng\bciengj" /I ".." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /YX /FD /GZ /c	69	# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\..\org.apache.harmony_vmcore_verifier\include" /I "..\..\..\Common" /I "..\..\..\jclass" /I "..\..\..\bcieng" /I "..\..\..\bcieng\bciengj" /I ".." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /YX /FD /GZ /c
70	# ADD BASE RSC /l 0x409 /d "_DEBUG"	70	# ADD BASE RSC /l 0x409 /d "_DEBUG"
71	# ADD RSC /l 0x409 /d "_DEBUG"	71	# ADD RSC /l 0x409 /d "_DEBUG"
72	BSC32=bscmake.exe	72	BSC32=bscmake.exe

Return to bug 148629

Lines 30-35 Link Here

(-)BCIEngJ/ModuleJ.h (-2 / +14 lines)
30		30
31	#include "Module.h"	31	#include "Module.h"
32	#include "JClassBuilder.h"	32	#include "JClassBuilder.h"
		33	#include "class_inerface_int.h"
33		34
34	class CModuleJ;	35	class CModuleJ;
35	class CMethodJ;	36	class CMethodJ;
Lines 57-75 public: Link Here
57	virtual void Open(CJClassBuilder* io_pClass, bool i_fDestroyClass = false);	58	virtual void Open(CJClassBuilder* io_pClass, bool i_fDestroyClass = false);
58	virtual void AddExtRef(CExtRef& i_ExtRef);	59	virtual void AddExtRef(CExtRef& i_ExtRef);
59	virtual void AddStringAttrib(CSTR i_szName, CSTR i_szValue);	60	virtual void AddStringAttrib(CSTR i_szName, CSTR i_szValue);
60	virtual void Parse();	61	virtual int Parse();
61	virtual void Emit();	62	virtual void Emit();
62		63
63	void Emit(CJStream& i_jstream); // Java specific emission	64	void Emit(CJStream& i_jstream); // Java specific emission
64	CJClassFile& GetClass();	65	CJClassFile& GetClass();
65	CJClassBuilder& GetClassBuilder();	66	CJClassBuilder& GetClassBuilder();
		67	class_handler GetClassHandler() {return m_classHandler;}
		68	verification_context GetVerificationContext(){return m_verificationContext;}
66		69
67	virtual const vector<string>& GetSourceFileNames();	70	virtual const vector<string>& GetSourceFileNames();
68		71
69	// Module modification methods	72	// Module modification methods
70	CCPFieldrefInfo* CreateFieldRef(u2 i_u2AccFlags, CSTR i_szName, CJavaType i_jtype);	73	CCPFieldrefInfo* CreateFieldRef(u2 i_u2AccFlags, CSTR i_szName, CJavaType i_jtype);
71	CMethodJ* CreateMethod(u2 i_u2AccFlags, CSTR i_szName, CSTR i_szSignature);	74	CMethodJ* CreateMethod(u2 i_u2AccFlags, CSTR i_szName, CSTR i_szSignature);
72		75	bool IsStackMapCalculationUsed() const {return m_use_stack_map_recalculation;}
		76	void UseStackMapCalculation(bool a_use_stack_map_recalculation) {m_use_stack_map_recalculation = a_use_stack_map_recalculation;}
73	protected:	77	protected:
74		78
75	private:	79	private:
Lines 85-90 private: Link Here
85	// Storage in support of GetSourceFileNames:	89	// Storage in support of GetSourceFileNames:
86	vector<string> m_sourceFileNames;	90	vector<string> m_sourceFileNames;
87	bool m_sourceFileNamesPopulated;	91	bool m_sourceFileNamesPopulated;
		92	verification_context m_verificationContext; /verifier context for support java 6.0 and latter/
		93	class_handler m_classHandler; /* class descriptor used for verification needs(recalculations) introduced in java 6.0*/
		94	method_handler m_methodContexts; /collections of method handlers*/
		95	bool m_use_stack_map_recalculation;
88	};	96	};
89		97
90	//==============================================================================	98	//==============================================================================
Lines 100-105 public: Link Here
100	m_strSignature = i_szSignature;	108	m_strSignature = i_szSignature;
101	m_pCodeAttr = i_pCodeAttr;	109	m_pCodeAttr = i_pCodeAttr;
102	m_u2AccessFlags = i_u2AccessFlags;	110	m_u2AccessFlags = i_u2AccessFlags;
		111
103		112
104	// Set the "hasThis" attribute, which is accessible to all CMethod users	113	// Set the "hasThis" attribute, which is accessible to all CMethod users
105	SetHasThis(!(m_u2AccessFlags & ACC_STATIC));	114	SetHasThis(!(m_u2AccessFlags & ACC_STATIC));
Lines 110-115 public: Link Here
110	CSTR GetSignature() const {return m_strSignature.c_str();}	119	CSTR GetSignature() const {return m_strSignature.c_str();}
111	bool IsAbstract() { return ((m_u2AccessFlags & ACC_ABSTRACT) != 0); };	120	bool IsAbstract() { return ((m_u2AccessFlags & ACC_ABSTRACT) != 0); };
112	u2 GetAccessFlags() const { return m_u2AccessFlags; }	121	u2 GetAccessFlags() const { return m_u2AccessFlags; }
		122	void SetMethodHandler(method_handler i_methodHandler) {m_methodHandler = i_methodHandler;}
		123	method_handler GetMethodHandler() {return m_methodHandler;}
113		124
114	virtual void Parse();	125	virtual void Parse();
115	virtual void Emit();	126	virtual void Emit();
Lines 121-126 private: Link Here
121	CCodeAttribute* m_pCodeAttr; // Code attribute from CJClassFile	132	CCodeAttribute* m_pCodeAttr; // Code attribute from CJClassFile
122	u2 m_u2AccessFlags; // Method access flags	133	u2 m_u2AccessFlags; // Method access flags
123	IP_t m_origCodeLength; // Saved code length from Parse to Emit	134	IP_t m_origCodeLength; // Saved code length from Parse to Emit
		135	method_handler m_methodHandler;
124	};	136	};
125		137
126		138

Lines 43-49 RSC=rc.exe Link Here

(-)BCIEngProbe/BCIEngProbe.dsp (-4 / +5 lines)
43	# PROP Ignore_Export_Lib 0	43	# PROP Ignore_Export_Lib 0
44	# PROP Target_Dir ""	44	# PROP Target_Dir ""
45	# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "BCIENGPROBE_EXPORTS" /YX /FD /c	45	# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "BCIENGPROBE_EXPORTS" /YX /FD /c
46	# ADD CPP /nologo /MT /W3 /GX /Zi /O2 /I "..\..\BCIEng\\" /I "..\..\BCIEng\BCIEngJ" /I "..\..\JClass" /I "..\..\common" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /c	46	# ADD CPP /nologo /MT /W3 /GX /Zd /O2 /I "..\..\..\..\..\verifier\include" /I "..\..\..\..\..\verifier\open\include" /I "..\..\..\..\..\harmony-verifier\include" /I "..\..\..\..\..\harmony-verifier\open\include" /I "..\..\..\..\..\recomp" /I "..\..\..\..\..\harmony-verifier\verifier-3363\x_verifier" /I "$(JAVA_HOME)\include" /I "$(JAVA_HOME)\include\win32" /I "..\..\BCIEng\\" /I "..\..\BCIEng\BCIEngJ" /I "..\..\JClass" /I "..\..\common" /I "..\..\..\..\..\org.apache.harmony_vmcore_verifier\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "VERIFIER_STANDALONE" /YX /FD /c
47	# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32	47	# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
48	# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32	48	# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
49	# ADD BASE RSC /l 0x409 /d "NDEBUG"	49	# ADD BASE RSC /l 0x409 /d "NDEBUG"
Lines 53-59 BSC32=bscmake.exe Link Here
53	# ADD BSC32 /nologo	53	# ADD BSC32 /nologo
54	LINK32=link.exe	54	LINK32=link.exe
55	# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386	55	# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
56	# ADD LINK32 kernel32.lib bciengj.lib /nologo /dll /debug /machine:I386 /libpath:"..\..\..\bci\jclass\release" /libpath:"..\..\..\bci\bcieng\bciengj\release"	56	# ADD LINK32 bciengj.lib kernel32.lib verifier-ext.lib /nologo /dll /debug /machine:I386 /libpath:"..\..\..\bci\jclass\release" /libpath:"..\..\..\bci\bcieng\bciengj\release" /libpath:"..\..\..\..\..\org.apache.harmony_vmcore_verifier\lib\win\IA-32"
57		57
58	!ELSEIF "$(CFG)" == "BCIEngProbe - Win32 Debug"	58	!ELSEIF "$(CFG)" == "BCIEngProbe - Win32 Debug"
59		59
Lines 69-75 LINK32=link.exe Link Here
69	# PROP Ignore_Export_Lib 0	69	# PROP Ignore_Export_Lib 0
70	# PROP Target_Dir ""	70	# PROP Target_Dir ""
71	# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "BCIENGPROBE_EXPORTS" /YX /FD /GZ /c	71	# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "BCIENGPROBE_EXPORTS" /YX /FD /GZ /c
72	# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\BCIEng\\" /I "..\..\BCIEng\BCIEngJ" /I "..\..\JClass" /I "..\..\common" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /FR /YX /FD /GZ /c	72	# ADD CPP /nologo /MDd /W3 /GX /Zd /Od /I "$(JAVA_HOME)\include" /I "$(JAVA_HOME)\include\win32" /I "..\..\BCIEng\\" /I "..\..\BCIEng\BCIEngJ" /I "..\..\JClass" /I "..\..\common" /I "..\..\..\..\..\org.apache.harmony_vmcore_verifier\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "VERIFIER_STANDALONE" /FR /YX /FD /GZ /c
73	# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32	73	# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
74	# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32	74	# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
75	# ADD BASE RSC /l 0x409 /d "_DEBUG"	75	# ADD BASE RSC /l 0x409 /d "_DEBUG"
Lines 79-85 BSC32=bscmake.exe Link Here
79	# ADD BSC32 /nologo	79	# ADD BSC32 /nologo
80	LINK32=link.exe	80	LINK32=link.exe
81	# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept	81	# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
82	# ADD LINK32 bciengj.lib kernel32.lib /nologo /dll /incremental:no /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\bci\jclass\debug" /libpath:"..\..\..\bci\bcieng\bciengj\debug"	82	# ADD LINK32 verifier.lib jvm.lib bciengj.lib kernel32.lib verifier-ext.lib /nologo /dll /incremental:no /debug /machine:I386 /out:"Debug/BCIEngProbe.dll " /pdbtype:sept /libpath:"..\..\..\bci\jclass\debug" /libpath:"..\..\..\bci\bcieng\bciengj\debug" /libpath:"..\..\..\..\..\harmony-verifier\verifier\verifier_6\verifier\debug" /libpath:"C:\jrockit-jdk1.6.0_02\lib" /libpath:"..\..\..\..\..\org.apache.harmony_vmcore_verifier\lib\win\IA-32"
		83	# SUBTRACT LINK32 /verbose
83		84
84	!ENDIF	85	!ENDIF
85		86