mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-23 17:05:26 +02:00
Code Issues Wiki Activity

Bug 573506: Fix counting of opcode bytes

Browse source 
Change-Id: Ib5d1f1984e064099fc5cb357508359a5805f131c
This commit is contained in:
John Dallaway 2021-05-12 19:54:56 +01:00
parent 39a5179311
commit 00204a3c4c
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/MIInstruction.java
View file

@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2000, 2015 QNX Software Systems and others.
* Copyright (c) 2000, 2021 QNX Software Systems and others.
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
@ -13,6 +13,7 @@
* Ericsson - Adapted for DSF
* Dmitry Kozlov (Mentor Graphics) - Add tab symbols parsing (Bug 391115)
* William Riley (Renesas) - Add raw Opcode parsing (Bug 357270)
* John Dallaway - Fix counting of opcode bytes (Bug 573506)
*******************************************************************************/
package org.eclipse.cdt.dsf.mi.service.command.output;
@ -165,7 +166,9 @@ public class MIInstruction extends AbstractInstruction {
try {
rawOpcodeString = str;
rawOpcodes = decodeOpcodes(str);
opcodeSize = Integer.valueOf(str.replace(" ", "").length() / 2); //$NON-NLS-1$//$NON-NLS-2$
// count the space-separated bytes (do not assume 8 bits per byte)
opcodeSize = (int) str.chars().filter(ch -> (' ' == ch)).count() + 1;
} catch (NumberFormatException e) {
}
continue;