diff options
| author | Elliott Hughes <enh@google.com> | 2013-02-14 10:09:00 -0800 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2013-02-14 10:09:00 -0800 |
| commit | 3599cdd1b4e72f4cb047fc31bf7c579764fa93d2 (patch) | |
| tree | 6c83046d686e3f4eb05be8c609a7a58652d71280 /vm/mterp | |
| parent | 2d28dc96680059afeba8910a539782f29613e06a (diff) | |
| download | android_dalvik-3599cdd1b4e72f4cb047fc31bf7c579764fa93d2.tar.gz android_dalvik-3599cdd1b4e72f4cb047fc31bf7c579764fa93d2.tar.bz2 android_dalvik-3599cdd1b4e72f4cb047fc31bf7c579764fa93d2.zip | |
Remove stray references to non-existent opcodes.
Change-Id: I83ca6ea12344a8df7ef14d600baf5060b76870f5
Diffstat (limited to 'vm/mterp')
| -rw-r--r-- | vm/mterp/armv5te/OP_INVOKE_OBJECT_INIT_RANGE.S | 2 | ||||
| -rw-r--r-- | vm/mterp/mips/OP_INVOKE_OBJECT_INIT_RANGE.S | 2 | ||||
| -rw-r--r-- | vm/mterp/out/InterpAsm-x86.S | 3 | ||||
| -rw-r--r-- | vm/mterp/x86/OP_INVOKE_OBJECT_INIT_RANGE.S | 8 | ||||
| -rw-r--r-- | vm/mterp/x86/footer.S | 3 |
5 files changed, 6 insertions, 12 deletions
diff --git a/vm/mterp/armv5te/OP_INVOKE_OBJECT_INIT_RANGE.S b/vm/mterp/armv5te/OP_INVOKE_OBJECT_INIT_RANGE.S index ab89189e9..f97c4e355 100644 --- a/vm/mterp/armv5te/OP_INVOKE_OBJECT_INIT_RANGE.S +++ b/vm/mterp/armv5te/OP_INVOKE_OBJECT_INIT_RANGE.S @@ -1,4 +1,4 @@ -%default { "jumbo":"0", "cccc":"2" } +%default { "cccc":"2" } %verify "executed" %verify "finalizable class" /* diff --git a/vm/mterp/mips/OP_INVOKE_OBJECT_INIT_RANGE.S b/vm/mterp/mips/OP_INVOKE_OBJECT_INIT_RANGE.S index 993afd734..705be9ff0 100644 --- a/vm/mterp/mips/OP_INVOKE_OBJECT_INIT_RANGE.S +++ b/vm/mterp/mips/OP_INVOKE_OBJECT_INIT_RANGE.S @@ -1,4 +1,4 @@ -%default { "jumbo":"0", "cccc":"2" } +%default { "cccc":"2" } %verify "executed" %verify "finalizable class" /* diff --git a/vm/mterp/out/InterpAsm-x86.S b/vm/mterp/out/InterpAsm-x86.S index 32ed5a1ac..760e6740b 100644 --- a/vm/mterp/out/InterpAsm-x86.S +++ b/vm/mterp/out/InterpAsm-x86.S @@ -16027,8 +16027,7 @@ common_selectTrace2: /* * For the invoke codes we need to know what register holds the "this" pointer. However * it seems the this pointer is assigned consistently most times it is in %ecx but other - * times it is in OP_INVOKE_INTERFACE_JUMBO OP_INVOKE_INTERFACE OP_INVOKE_SUPER_QUICK and - * OP_INVOKE_VIRTUAL_QUICK + * times it is in OP_INVOKE_INTERFACE, OP_INVOKE_SUPER_QUICK, or OP_INVOKE_VIRTUAL_QUICK. */ /* diff --git a/vm/mterp/x86/OP_INVOKE_OBJECT_INIT_RANGE.S b/vm/mterp/x86/OP_INVOKE_OBJECT_INIT_RANGE.S index d5d10a685..f6e3f42e7 100644 --- a/vm/mterp/x86/OP_INVOKE_OBJECT_INIT_RANGE.S +++ b/vm/mterp/x86/OP_INVOKE_OBJECT_INIT_RANGE.S @@ -1,4 +1,4 @@ -%default { "jumbo":"0", "cccc":"2" } +%default { "cccc":"2" } %verify "executed" %verify "finalizable class" /* @@ -6,7 +6,7 @@ * Object's nullary constructor doesn't do anything, so we just * skip it unless a debugger is active. */ - movzwl 4(rPC),%eax # eax<- CCCC, offset = 2 * cccc, cccc = 4 for jumbo + movzwl 4(rPC),%eax # eax<- CCCC, offset = 2 * cccc GET_VREG_R %ecx, %eax # ecx<- "this" ptr testl %ecx,%ecx # null this? je common_errNullObject # yes, fail @@ -45,11 +45,7 @@ */ .L${opcode}_debugger: movl offThread_mainHandlerTable(%ecx), %ecx # load main handler table - .if $jumbo # if jumbo is enabled - movl $$OP_INVOKE_DIRECT_JUMBO, %eax - .else movl $$OP_INVOKE_DIRECT_RANGE, %eax - .endif /* * We can't use GOTO_NEXT here since we want to jump directly to * handler without touching rIBASE. diff --git a/vm/mterp/x86/footer.S b/vm/mterp/x86/footer.S index 8b77482b0..3b5c79e70 100644 --- a/vm/mterp/x86/footer.S +++ b/vm/mterp/x86/footer.S @@ -350,8 +350,7 @@ common_selectTrace2: /* * For the invoke codes we need to know what register holds the "this" pointer. However * it seems the this pointer is assigned consistently most times it is in %ecx but other - * times it is in OP_INVOKE_INTERFACE_JUMBO OP_INVOKE_INTERFACE OP_INVOKE_SUPER_QUICK and - * OP_INVOKE_VIRTUAL_QUICK + * times it is in OP_INVOKE_INTERFACE, OP_INVOKE_SUPER_QUICK, or OP_INVOKE_VIRTUAL_QUICK. */ /* |