Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(23)

Unified Diff: src/DartARM32/assembler_arm.h

Issue 1397933002: Start incorporating the ARM integrated assembler. (Closed) Base URL: https://chromium.googlesource.com/native_client/pnacl-subzero.git@master
Patch Set: Fix nit and add URL. Created 5 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Makefile.standalone ('k') | src/DartARM32/assembler_arm.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/DartARM32/assembler_arm.h
diff --git a/src/DartARM32/assembler_arm.h b/src/DartARM32/assembler_arm.h
index c686d600433ad1b79e716436ae46a5172d5cf2e7..7893d6f940fbea86719982433bfa3055340833dd 100644
--- a/src/DartARM32/assembler_arm.h
+++ b/src/DartARM32/assembler_arm.h
@@ -27,7 +27,8 @@ namespace dart {
class RuntimeEntry;
class StubEntry;
-
+#if 0
+// Moved to: ARM32::AssemblerARM32.
// Instruction encoding bits.
enum {
H = 1 << 5, // halfword (or byte)
@@ -68,7 +69,7 @@ enum {
B26 = 1 << 26,
B27 = 1 << 27,
};
-
+#endif
class Label : public ValueObject {
public:
@@ -532,6 +533,8 @@ class Assembler : public ValueObject {
void clrex();
void nop(Condition cond = AL);
+#if 0
+ // Moved to: ARM32::AssemblerARM32.
// Note that gdb sets breakpoints using the undefined instruction 0xe7f001f0.
void bkpt(uint16_t imm16);
@@ -540,6 +543,7 @@ class Assembler : public ValueObject {
return (AL << kConditionShift) | B24 | B21 |
((imm16 >> 4) << 8) | B6 | B5 | B4 | (imm16 & 0xf);
}
+#endif
static uword GetBreakInstructionFiller() {
return BkptEncoding(0);
@@ -660,7 +664,10 @@ class Assembler : public ValueObject {
// Branch instructions.
void b(Label* label, Condition cond = AL);
void bl(Label* label, Condition cond = AL);
+#if 0
+ // Moved to: ARM32::AssemblerARM32.
void bx(Register rm, Condition cond = AL);
+#endif
void blx(Register rm, Condition cond = AL);
void Branch(const StubEntry& stub_entry,
« no previous file with comments | « Makefile.standalone ('k') | src/DartARM32/assembler_arm.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698