1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-29 19:45:01 +02:00

Bug 341762: MIDataReadMemory problem when word_size != 1

This commit is contained in:
John Dallaway 2011-10-26 16:15:43 -04:00 committed by Marc Khouzam
parent e4aed35b52
commit e03958b6ad

View file

@ -1,5 +1,5 @@
/******************************************************************************* /*******************************************************************************
* Copyright (c) 2000, 2009, 2007 QNX Software Systems and others. * Copyright (c) 2000, 2011 QNX Software Systems and others.
* All rights reserved. This program and the accompanying materials * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0 * are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at * which accompanies this distribution, and is available at
@ -8,6 +8,7 @@
* Contributors: * Contributors:
* QNX Software Systems - Initial API and implementation * QNX Software Systems - Initial API and implementation
* Ericsson AB - Modified for new DSF Reference Implementation * Ericsson AB - Modified for new DSF Reference Implementation
* John Dallaway - Accept word size bigger than 1 (Bug 341762)
*******************************************************************************/ *******************************************************************************/
package org.eclipse.cdt.dsf.mi.service.command.commands; package org.eclipse.cdt.dsf.mi.service.command.commands;
@ -74,7 +75,7 @@ public class MIDataReadMemory extends MICommand<MIDataReadMemoryInfo> {
fword_size = word_size; fword_size = word_size;
if (offset != 0) { if (offset != 0) {
setOptions(new String[] { "-o", Long.toString(offset * word_size)}); //$NON-NLS-1$ setOptions(new String[] { "-o", Long.toString(offset)}); //$NON-NLS-1$
} }
String format = "x"; //$NON-NLS-1$ String format = "x"; //$NON-NLS-1$
@ -128,17 +129,17 @@ public class MIDataReadMemory extends MICommand<MIDataReadMemoryInfo> {
new String[] { new String[] {
address, address,
format, format,
Integer.toString(1), // wordSize Integer.toString(word_size),
Integer.toString(rows), Integer.toString(rows),
Integer.toString(cols * word_size)}); Integer.toString(cols)});
} else { } else {
setParameters( setParameters(
new String[] { new String[] {
address, address,
format, format,
Integer.toString(1), // wordSize Integer.toString(word_size),
Integer.toString(rows), Integer.toString(rows),
Integer.toString(cols * word_size), Integer.toString(cols),
asChar.toString()}); asChar.toString()});
} }
} }