From 327c3c7116f8716f447e61683bb8083b3c78095d Mon Sep 17 00:00:00 2001 From: John Dallaway Date: Fri, 17 Sep 2021 12:21:28 +0100 Subject: [PATCH] Bug 576058: Fix traditional memory rendering byte ordering Change-Id: Ie942a36ebd9d728c4f1673a6e5122b296f428dd2 --- .../META-INF/MANIFEST.MF | 2 +- .../eclipse/cdt/debug/ui/memory/traditional/Rendering.java | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/memory/org.eclipse.cdt.debug.ui.memory.traditional/META-INF/MANIFEST.MF b/memory/org.eclipse.cdt.debug.ui.memory.traditional/META-INF/MANIFEST.MF index c2c81735aad..ce683e56d40 100644 --- a/memory/org.eclipse.cdt.debug.ui.memory.traditional/META-INF/MANIFEST.MF +++ b/memory/org.eclipse.cdt.debug.ui.memory.traditional/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.cdt.debug.ui.memory.traditional;singleton:=true -Bundle-Version: 1.6.100.qualifier +Bundle-Version: 1.6.200.qualifier Bundle-Localization: plugin Require-Bundle: org.eclipse.debug.core, org.eclipse.debug.ui, diff --git a/memory/org.eclipse.cdt.debug.ui.memory.traditional/src/org/eclipse/cdt/debug/ui/memory/traditional/Rendering.java b/memory/org.eclipse.cdt.debug.ui.memory.traditional/src/org/eclipse/cdt/debug/ui/memory/traditional/Rendering.java index 99f62fb61ae..5002e45db92 100644 --- a/memory/org.eclipse.cdt.debug.ui.memory.traditional/src/org/eclipse/cdt/debug/ui/memory/traditional/Rendering.java +++ b/memory/org.eclipse.cdt.debug.ui.memory.traditional/src/org/eclipse/cdt/debug/ui/memory/traditional/Rendering.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006, 2016 Wind River Systems, Inc. and others. + * Copyright (c) 2006, 2021 Wind River Systems, Inc. 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 @@ * Alvaro Sanchez-Leon (Ericsson AB) - [Memory] Support 16 bit addressable size (Bug 426730) * Ling Wang (Silicon Laboratories) - Honor start address (Bug 414519) * Teodor Madan (Freescale) - Fix scrolling for memory spaces with 64-bit address + * John Dallaway - Fix byte ordering when addressableSize != 1 (Bug 576058) *******************************************************************************/ package org.eclipse.cdt.debug.ui.memory.traditional; @@ -836,7 +837,7 @@ public class Rendering extends Composite implements IDebugEventSetListener { for (int unit = 0; unit < units; unit++) { for (int unitbyte = 0; unitbyte < unitSize; unitbyte++) { cachedBytesAsByteSequence[unit * unitSize + unitbyte] = cachedBytes[unit * unitSize - + unitSize - unitbyte]; + + unitSize - unitbyte - 1]; } } cachedBytes = cachedBytesAsByteSequence;