diff options
| author | Dan Bornstein <danfuzz@android.com> | 2011-01-30 14:05:39 -0800 |
|---|---|---|
| committer | Dan Bornstein <danfuzz@android.com> | 2011-01-30 14:09:38 -0800 |
| commit | 7ba91291bb6ce64691398a8751656207e8e3e98d (patch) | |
| tree | adb22979c99303ef0bbb2d2b8990bfc9e80f2172 /opcode-gen | |
| parent | 3c5df37a2df7368eb274eb097e9cfa2ccc7fffb6 (diff) | |
| download | android_dalvik-7ba91291bb6ce64691398a8751656207e8e3e98d.tar.gz android_dalvik-7ba91291bb6ce64691398a8751656207e8e3e98d.tar.bz2 android_dalvik-7ba91291bb6ce64691398a8751656207e8e3e98d.zip | |
Move dx.dex.code.DalvOps -> dx.io.Opcodes.
This breaks a nascent circular dependency, keeping dx.io the lower layer.
Bonus: While I was in the territory, I clarified the data payload
opcodes, including adding explicit constants for them.
Change-Id: I8655064ebc3b5713cbb4a6c83bcc90984393701f
Diffstat (limited to 'opcode-gen')
| -rw-r--r-- | opcode-gen/opcode-gen.awk | 8 | ||||
| -rwxr-xr-x | opcode-gen/regen-all | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/opcode-gen/opcode-gen.awk b/opcode-gen/opcode-gen.awk index 86e7cae59..e269abf39 100644 --- a/opcode-gen/opcode-gen.awk +++ b/opcode-gen/opcode-gen.awk @@ -80,7 +80,7 @@ emission == "first-opcodes" { for (i = 0; i <= MAX_OPCODE; i++) { if (isUnused(i) || isOptimized(i)) continue; if (isFirst[i] == "true") { - printf(" // DalvOps.%s\n", constName[i]); + printf(" // Opcodes.%s\n", constName[i]); } } } @@ -95,8 +95,8 @@ emission == "dops" { nextOp = (nextOp == -1) ? "NO_NEXT" : constName[nextOp]; printf(" public static final Dop %s =\n" \ - " new Dop(DalvOps.%s, DalvOps.%s,\n" \ - " DalvOps.%s, Form%s.THE_ONE, %s,\n" \ + " new Dop(Opcodes.%s, Opcodes.%s,\n" \ + " Opcodes.%s, Form%s.THE_ONE, %s,\n" \ " \"%s\");\n\n", constName[i], constName[i], family[i], nextOp, format[i], hasResult[i], name[i]); @@ -119,7 +119,7 @@ emission == "opcode-info-defs" { } printf(" public static final Info %s =\n" \ - " new Info(DalvOps.%s,\n" \ + " new Info(Opcodes.%s,\n" \ " InstructionCodec.FORMAT_%s, %s);\n\n", \ constName[i], constName[i], toupper(format[i]), itype); } diff --git a/opcode-gen/regen-all b/opcode-gen/regen-all index 68bbd64d2..afe66242c 100755 --- a/opcode-gen/regen-all +++ b/opcode-gen/regen-all @@ -34,10 +34,10 @@ progdir=`pwd` # Be in the parent of the progdir when running the rest of the script. cd ".." -${progdir}/opcode-gen dx/src/com/android/dx/dex/code/DalvOps.java ${progdir}/opcode-gen dx/src/com/android/dx/dex/code/Dops.java ${progdir}/opcode-gen dx/src/com/android/dx/dex/code/RopToDop.java ${progdir}/opcode-gen dx/src/com/android/dx/io/OpcodeInfo.java +${progdir}/opcode-gen dx/src/com/android/dx/io/Opcodes.java ${progdir}/opcode-gen libdex/DexOpcodes.c ${progdir}/opcode-gen libdex/DexOpcodes.h ${progdir}/opcode-gen libdex/InstrUtils.c |