summaryrefslogtreecommitdiffstats
path: root/libpixelflinger/codeflinger
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2010-11-23 11:02:51 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2010-11-23 11:02:51 -0800
commit720fdebb4ca2306133099126eb1f10b0b79ccce1 (patch)
treee6182215df37b7ed9e8e3413210c37fb568d570e /libpixelflinger/codeflinger
parentb7171987382b768466a472c4c5f84cc496c95aea (diff)
parent4906db21e041327042b87122b233e1f150618334 (diff)
downloadsystem_core-720fdebb4ca2306133099126eb1f10b0b79ccce1.zip
system_core-720fdebb4ca2306133099126eb1f10b0b79ccce1.tar.gz
system_core-720fdebb4ca2306133099126eb1f10b0b79ccce1.tar.bz2
am 4906db21: Merge "codeflinger: Correct misleading comment of STM instruction"
* commit '4906db21e041327042b87122b233e1f150618334': codeflinger: Correct misleading comment of STM instruction
Diffstat (limited to 'libpixelflinger/codeflinger')
-rw-r--r--libpixelflinger/codeflinger/ARMAssembler.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/libpixelflinger/codeflinger/ARMAssembler.cpp b/libpixelflinger/codeflinger/ARMAssembler.cpp
index fa9f1ad..4726a08 100644
--- a/libpixelflinger/codeflinger/ARMAssembler.cpp
+++ b/libpixelflinger/codeflinger/ARMAssembler.cpp
@@ -334,7 +334,7 @@ void ARMAssembler::LDM(int cc, int dir,
void ARMAssembler::STM(int cc, int dir,
int Rn, int W, uint32_t reg_list)
-{ // FA EA FD ED IB IA DB DA
+{ // ED FD EA FA IB IA DB DA
const uint8_t P[8] = { 0, 1, 0, 1, 1, 0, 1, 0 };
const uint8_t U[8] = { 0, 0, 1, 1, 1, 1, 0, 0 };
*mPC++ = (cc<<28) | (4<<25) | (uint32_t(P[dir])<<24) |