summaryrefslogtreecommitdiff
path: root/src/compiler/codegen/arm/Assemble.cc
diff options
context:
space:
mode:
author Brian Carlstrom <bdc@google.com> 2012-01-11 18:10:55 -0800
committer Brian Carlstrom <bdc@google.com> 2012-01-17 17:42:34 -0800
commite7d856b911222aa000ca2be0f8f63f5b292141c3 (patch)
tree9628ef94e879c7ae026dd37ec05e1ab3251d830a /src/compiler/codegen/arm/Assemble.cc
parenta51dc5b0a57fdf0574c069a15e065ccc96958f02 (diff)
Add GC map to oat file
Change-Id: Ied0462c711a09e2542f231c3b2fa31239958bd28
Diffstat (limited to 'src/compiler/codegen/arm/Assemble.cc')
-rw-r--r--src/compiler/codegen/arm/Assemble.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/compiler/codegen/arm/Assemble.cc b/src/compiler/codegen/arm/Assemble.cc
index 9a1a30ed55..a73a27af77 100644
--- a/src/compiler/codegen/arm/Assemble.cc
+++ b/src/compiler/codegen/arm/Assemble.cc
@@ -974,12 +974,12 @@ ArmEncodingMap EncodingMap[kArmLast] = {
*/
#define PADDING_MOV_R5_R5 0x1C2D
-STATIC void pushWord(std::vector<short>&buf, int data) {
+STATIC void pushWord(std::vector<uint16_t>&buf, int data) {
buf.push_back( data & 0xffff);
buf.push_back( (data >> 16) & 0xffff);
}
-void alignBuffer(std::vector<short>&buf, size_t offset) {
+void alignBuffer(std::vector<uint16_t>&buf, size_t offset) {
while (buf.size() < (offset/2))
buf.push_back(0);
}