Attachment 187375 Details for Bug 326878 – Fix

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

[patch] Fix

zpatch.txt (text/plain), 5.19 KB, created by Marc Khouzam

on 2011-01-22 21:57:31 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Marc Khouzam

Created: 2011-01-22 21:57:31 EST

Size: 5.19 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.cdt.tests.dsf.gdb
>Index: src/org/eclipse/cdt/tests/dsf/gdb/tests/MIRegistersTest.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MIRegistersTest.java,v
>retrieving revision 1.8
>diff -u -r1.8 MIRegistersTest.java
>--- src/org/eclipse/cdt/tests/dsf/gdb/tests/MIRegistersTest.java	23 Jan 2011 02:28:59 -0000	1.8
>+++ src/org/eclipse/cdt/tests/dsf/gdb/tests/MIRegistersTest.java	23 Jan 2011 02:55:45 -0000
>@@ -65,13 +65,18 @@
> @RunWith(BackgroundRunner.class)
> 
> public class MIRegistersTest extends BaseTestCase {
>-
>-	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"));
>-	static {
>+	
>+	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)) {
>-    		X86_REGS.remove("orig_eax");
>+		if (Platform.getOS().equals(Platform.OS_WIN32)) {
>+    		list.remove("orig_eax");
> 	    }
>+		return list;
> 	}
> 	
> 	/*
>@@ -195,7 +200,7 @@
>             
>         fWait.waitReset();
> 
>-        assertEquals("Wrong number of registers", X86_REGS.size(), regContexts.length); 
>+        assertEquals("Wrong number of registers", get_X86_REGS().size(), regContexts.length); 
> 
>         return(regContexts);
>     }
>@@ -230,7 +235,7 @@
>     	MIStoppedEvent stoppedEvent = getInitialStoppedEvent();
>         IFrameDMContext frameDmc = SyncUtil.getStackFrame(stoppedEvent.getDMContext(), 0);
>     	final IRegisterDMContext[] regDMCs = getRegisters(frameDmc);
>-    	assertEquals("Wrong number of registers", X86_REGS.size(), regDMCs.length);
>+    	assertEquals("Wrong number of registers", get_X86_REGS().size(), regDMCs.length);
>     }
>     
>     @Test
>@@ -238,7 +243,7 @@
>     	MIStoppedEvent stoppedEvent = getInitialStoppedEvent();
>         IFrameDMContext frameDmc = SyncUtil.getStackFrame(stoppedEvent.getDMContext(), 0);
>     	final IRegisterDMContext[] regDMCs = getRegisters(frameDmc);
>-    	List<String> regNames = X86_REGS; 
>+    	List<String> regNames = get_X86_REGS(); 
>     	
>         Query<IRegisterDMData[]> query = new Query<IRegisterDMData[]>() {
>             @Override
>Index: src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_2/MIRegistersTest_7_2.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_2/MIRegistersTest_7_2.java,v
>retrieving revision 1.1
>diff -u -r1.1 MIRegistersTest_7_2.java
>--- src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_2/MIRegistersTest_7_2.java	4 Jun 2010 15:46:36 -0000	1.1
>+++ src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_2/MIRegistersTest_7_2.java	23 Jan 2011 02:55:45 -0000
>@@ -10,9 +10,14 @@
>  *******************************************************************************/
> package org.eclipse.cdt.tests.dsf.gdb.tests.tests_7_2;
> 
>+import java.util.Arrays;
>+import java.util.LinkedList;
>+import java.util.List;
>+
> import org.eclipse.cdt.tests.dsf.gdb.framework.BackgroundRunner;
> import org.eclipse.cdt.tests.dsf.gdb.tests.ITestConstants;
> import org.eclipse.cdt.tests.dsf.gdb.tests.MIRegistersTest;
>+import org.eclipse.core.runtime.Platform;
> import org.junit.BeforeClass;
> import org.junit.runner.RunWith;
> 
>@@ -22,4 +27,23 @@
> 	public static void beforeClassMethod_7_2() {
> 		setGdbProgramNamesLaunchAttributes(ITestConstants.SUFFIX_GDB_7_2);
> 	}
>+	
>+	// GDB's list of registers is different with GDB 7.2
>+	@Override
>+	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",
>+																  "al","cl","dl","bl","ah","ch","dh","bh","ax","cx",
>+																  "dx","bx",/*"",*/"bp","si","di","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;
>+	}
>+
> }

Flags:

marc.khouzam: iplog-

Actions: View | Diff

Attachments on bug 326878: 187375