Attachment #187375 for bug #326878

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 326878
Collapse All | Expand All




@RunWith(BackgroundRunner.class)

public class MIRegistersTest extends BaseTestCase {
	
	protected List<String> get_X86_REGS() {
		List<String>  list = new LinkedList<String>(Arrays.asList("eax","ecx","edx","ebx","esp","ebp","esi","edi","eip","eflags",
																  "cs","ss","ds","es","fs","gs","st0","st1","st2","st3",
																  "st4","st5","st6","st7","fctrl","fstat","ftag","fiseg","fioff","foseg",
																  "fooff","fop","xmm0","xmm1","xmm2","xmm3","xmm4","xmm5","xmm6","xmm7",
																  "mxcsr","orig_eax","mm0","mm1","mm2","mm3","mm4","mm5","mm6","mm7"));
		// On Windows, gdb doesn't report "orig_eax" as a register. Apparently it does on Linux
		if (Platform.getOS().equals(Platform.OS_WIN32)) {
    		list.remove("orig_eax");
	    }
		return list;
	}
	
	/*

            
        fWait.waitReset();

        assertEquals("Wrong number of registers", get_X86_REGS().size(), regContexts.length); 

        return(regContexts);
    }

    	MIStoppedEvent stoppedEvent = getInitialStoppedEvent();
        IFrameDMContext frameDmc = SyncUtil.getStackFrame(stoppedEvent.getDMContext(), 0);
    	final IRegisterDMContext[] regDMCs = getRegisters(frameDmc);
    	assertEquals("Wrong number of registers", get_X86_REGS().size(), regDMCs.length);
    }
    
    @Test

    	MIStoppedEvent stoppedEvent = getInitialStoppedEvent();
        IFrameDMContext frameDmc = SyncUtil.getStackFrame(stoppedEvent.getDMContext(), 0);
    	final IRegisterDMContext[] regDMCs = getRegisters(frameDmc);
    	List<String> regNames = get_X86_REGS(); 
    	
        Query<IRegisterDMData[]> query = new Query<IRegisterDMData[]>() {
            @Override

Lines 10-18 Link Here

(-)src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_2/MIRegistersTest_7_2.java (+24 lines)
10	*******************************************************************************/	10	*******************************************************************************/
11	package org.eclipse.cdt.tests.dsf.gdb.tests.tests_7_2;	11	package org.eclipse.cdt.tests.dsf.gdb.tests.tests_7_2;
12		12
		13	import java.util.Arrays;
		14	import java.util.LinkedList;
		15	import java.util.List;
		16
13	import org.eclipse.cdt.tests.dsf.gdb.framework.BackgroundRunner;	17	import org.eclipse.cdt.tests.dsf.gdb.framework.BackgroundRunner;
14	import org.eclipse.cdt.tests.dsf.gdb.tests.ITestConstants;	18	import org.eclipse.cdt.tests.dsf.gdb.tests.ITestConstants;
15	import org.eclipse.cdt.tests.dsf.gdb.tests.MIRegistersTest;	19	import org.eclipse.cdt.tests.dsf.gdb.tests.MIRegistersTest;
		20	import org.eclipse.core.runtime.Platform;
16	import org.junit.BeforeClass;	21	import org.junit.BeforeClass;
17	import org.junit.runner.RunWith;	22	import org.junit.runner.RunWith;
18		23
Lines 22-25 Link Here
22	public static void beforeClassMethod_7_2() {	27	public static void beforeClassMethod_7_2() {
23	setGdbProgramNamesLaunchAttributes(ITestConstants.SUFFIX_GDB_7_2);	28	setGdbProgramNamesLaunchAttributes(ITestConstants.SUFFIX_GDB_7_2);
24	}	29	}
		30
		31	// GDB's list of registers is different with GDB 7.2
		32	@Override
		33	protected List<String> get_X86_REGS() {
		34	List<String> list = new LinkedList<String>(Arrays.asList("eax","ecx","edx","ebx","esp","ebp","esi","edi","eip","eflags",
		35	"cs","ss","ds","es","fs","gs","st0","st1","st2","st3",
		36	"st4","st5","st6","st7","fctrl","fstat","ftag","fiseg","fioff","foseg",
		37	"fooff","fop","xmm0","xmm1","xmm2","xmm3","xmm4","xmm5","xmm6","xmm7",
		38	"mxcsr",/"","","","","","","","",/"orig_eax",
		39	"al","cl","dl","bl","ah","ch","dh","bh","ax","cx",
		40	"dx","bx",/"",/"bp","si","di","mm0","mm1","mm2","mm3",
		41	"mm4","mm5","mm6","mm7"));
		42	// On Windows, gdb doesn't report "orig_eax" as a register. Apparently it does on Linux
		43	if (Platform.getOS().equals(Platform.OS_WIN32)) {
		44	list.remove("orig_eax");
		45	}
		46	return list;
		47	}
		48
25	}	49	}

Return to bug 326878

Lines 65-77 Link Here

(-)src/org/eclipse/cdt/tests/dsf/gdb/tests/MIRegistersTest.java (-8 / +13 lines)
65	@RunWith(BackgroundRunner.class)	65	@RunWith(BackgroundRunner.class)
66		66
67	public class MIRegistersTest extends BaseTestCase {	67	public class MIRegistersTest extends BaseTestCase {
68		68
69	static final List<String> X86_REGS = new LinkedList<String>(Arrays.asList("eax","ecx","edx","ebx","esp","ebp","esi","edi","eip","eflags","cs","ss","ds","es","fs","gs","st0","st1","st2","st3","st4","st5","st6","st7","fctrl","fstat","ftag","fiseg","fioff","foseg","fooff","fop","xmm0","xmm1","xmm2","xmm3","xmm4","xmm5","xmm6","xmm7","mxcsr","orig_eax","mm0","mm1","mm2","mm3","mm4","mm5","mm6","mm7"));	69	protected List<String> get_X86_REGS() {
70	static {	70	List<String> list = new LinkedList<String>(Arrays.asList("eax","ecx","edx","ebx","esp","ebp","esi","edi","eip","eflags",
		71	"cs","ss","ds","es","fs","gs","st0","st1","st2","st3",
		72	"st4","st5","st6","st7","fctrl","fstat","ftag","fiseg","fioff","foseg",
		73	"fooff","fop","xmm0","xmm1","xmm2","xmm3","xmm4","xmm5","xmm6","xmm7",
		74	"mxcsr","orig_eax","mm0","mm1","mm2","mm3","mm4","mm5","mm6","mm7"));
71	// On Windows, gdb doesn't report "orig_eax" as a register. Apparently it does on Linux	75	// On Windows, gdb doesn't report "orig_eax" as a register. Apparently it does on Linux
72	if (Platform.getOS().equals(Platform.OS_WIN32)) {	76	if (Platform.getOS().equals(Platform.OS_WIN32)) {
73	X86_REGS.remove("orig_eax");	77	list.remove("orig_eax");
74	}	78	}
		79	return list;
75	}	80	}
76		81
77	/*	82	/*
Lines 195-201 Link Here
195		200
196	fWait.waitReset();	201	fWait.waitReset();
197		202
198	assertEquals("Wrong number of registers", X86_REGS.size(), regContexts.length);	203	assertEquals("Wrong number of registers", get_X86_REGS().size(), regContexts.length);
199		204
200	return(regContexts);	205	return(regContexts);
201	}	206	}
Lines 230-236 Link Here
230	MIStoppedEvent stoppedEvent = getInitialStoppedEvent();	235	MIStoppedEvent stoppedEvent = getInitialStoppedEvent();
231	IFrameDMContext frameDmc = SyncUtil.getStackFrame(stoppedEvent.getDMContext(), 0);	236	IFrameDMContext frameDmc = SyncUtil.getStackFrame(stoppedEvent.getDMContext(), 0);
232	final IRegisterDMContext[] regDMCs = getRegisters(frameDmc);	237	final IRegisterDMContext[] regDMCs = getRegisters(frameDmc);
233	assertEquals("Wrong number of registers", X86_REGS.size(), regDMCs.length);	238	assertEquals("Wrong number of registers", get_X86_REGS().size(), regDMCs.length);
234	}	239	}
235		240
236	@Test	241	@Test
Lines 238-244 Link Here
238	MIStoppedEvent stoppedEvent = getInitialStoppedEvent();	243	MIStoppedEvent stoppedEvent = getInitialStoppedEvent();
239	IFrameDMContext frameDmc = SyncUtil.getStackFrame(stoppedEvent.getDMContext(), 0);	244	IFrameDMContext frameDmc = SyncUtil.getStackFrame(stoppedEvent.getDMContext(), 0);
240	final IRegisterDMContext[] regDMCs = getRegisters(frameDmc);	245	final IRegisterDMContext[] regDMCs = getRegisters(frameDmc);
241	List<String> regNames = X86_REGS;	246	List<String> regNames = get_X86_REGS();
242		247
243	Query<IRegisterDMData[]> query = new Query<IRegisterDMData[]>() {	248	Query<IRegisterDMData[]> query = new Query<IRegisterDMData[]>() {
244	@Override	249	@Override