OSDN Git Service
jeffhao [Tue, 9 Nov 2010 22:24:28 +0000 (14:24 -0800)]
Added info for parallel dx switch "num-threads" to help message.
Change-Id: I7fa31ab7160956c135ab95f8411ad359f616403d
Dan Bornstein [Tue, 9 Nov 2010 18:27:05 +0000 (10:27 -0800)]
Merge "Add const-class/jumbo." into dalvik-dev
Andy McFadden [Tue, 9 Nov 2010 04:15:42 +0000 (20:15 -0800)]
Andy McFadden [Tue, 9 Nov 2010 04:00:39 +0000 (20:00 -0800)]
Andy McFadden [Tue, 9 Nov 2010 03:38:19 +0000 (19:38 -0800)]
am
e9503ef8: am
886130bc: (-s ours) Two patches.
* commit '
e9503ef8c460f4818062ecc80a9e0b4f8c6745b8':
Two patches.
Andy McFadden [Tue, 9 Nov 2010 02:13:32 +0000 (18:13 -0800)]
am
886130bc: (-s ours) Two patches.
* commit '
886130bc7ff992940e152636f57072e58c91aa2e':
Two patches.
Dan Bornstein [Tue, 9 Nov 2010 02:03:33 +0000 (18:03 -0800)]
Add const-class/jumbo.
I neglected to include this one in my original list of new opcodes.
Change-Id: Ia59b4b2f21516d851f0398361eb5db1cb413aaab
Dan Bornstein [Tue, 9 Nov 2010 01:36:31 +0000 (17:36 -0800)]
Merge "Add the new jumbo opcodes to dx...almost." into dalvik-dev
Andy McFadden [Tue, 9 Nov 2010 01:05:39 +0000 (17:05 -0800)]
Two patches.
Patch 1a+1b: Set capabilities sooner.
(cherry-pick from gingerbread I22fde728bd5d65774f8fdf1fa45956fe18358c4c)
(hand-pick from gingerbread Ief58bdfff2cb82d7824ef796c2c1031f525f6ee9,
plus minor tweak to avoid altering the API)
Patch 3: If there's an error dropping privileges, abort.
(cherry-pick from gingerbread I85ce12e93cb8c297add756dc3b872b8346eda00b)
Bug
3176774
Change-Id: If8285d7bfd5a466bd77c0f7ffadf1bf96d31db06
Elliott Hughes [Tue, 9 Nov 2010 00:57:12 +0000 (16:57 -0800)]
Merge "Track change in libcore/NativeCode.mk." into dalvik-dev
Elliott Hughes [Tue, 9 Nov 2010 00:54:57 +0000 (16:54 -0800)]
Track change in libcore/NativeCode.mk.
Bug:
2281992
Change-Id: Ibfb877bc78396bc0e947ae2f8f86e484843f07de
Dan Bornstein [Tue, 9 Nov 2010 00:28:33 +0000 (16:28 -0800)]
Add the new jumbo opcodes to dx...almost.
This change adds the new opcodes while simultaneously preventing
them from actually being emitted, the prevention being controlled
by a new flag in InsnFormat.
Empirically speaking, we already have latent demand for the new
opcodes -- specifically because they allow for wider register
references than their wee companions -- and so we can't actually
enable their generation until the VM is prepared to execute them.
If you're wondering why dx without the new opcodes doesn't crap out on
the register references in question, it's because there's code in dx
which will expand an instruction that has non-fitting register
references into a sequence of two or more instructions, where it
shuffles values into and out of usable registers before and/or after
the instruction. When we turn on the jumbo opcodes, at least some
of these register shuffles will immediately get to go away.
Change-Id: I3f921ab07efa4944d7526fa48534d69f508ac249
Dan Bornstein [Mon, 8 Nov 2010 23:55:32 +0000 (15:55 -0800)]
Minor tweaks and clarification.
Change-Id: I861c2d65fea468fd1f085d845981b1cd9d98d3a8
Dan Bornstein [Mon, 8 Nov 2010 21:13:54 +0000 (13:13 -0800)]
Another bit of cleanup.
Making it a little easier to have more than 256 opcodes.
Change-Id: I050050f2b6078407dde4d4f214dec2c1a331000c
Andy McFadden [Thu, 4 Nov 2010 23:31:37 +0000 (16:31 -0700)]
Move some verifier stuff around.
Once upon a time we started down the road of "just in time" register
map generation, which was intended to save flash and RAM storage by
generating register maps for methods as the GC needed them (rather than
doing them all up front, or on first load of a class). This required
a lot of duplication of code, and in the end just wasn't worth it.
This removes the (#ifdefed-out) partial implementation. Some functions
that were moved into VerifySubs to be shared with RegisterMap.c are
moved back to their previous homes.
Some temporary VERIFIER_STATS stuff is also getting checked in (#ifdefed
out).
Added an assert, tweaked a couple of comments. No changes in behavior
are expected.
Change-Id: I20b915992add9906cb3638ac9432c910443a9a47
Dan Bornstein [Thu, 4 Nov 2010 23:42:11 +0000 (16:42 -0700)]
Merge "Use the static opcode chains in dx." into dalvik-dev
Carl Shapiro [Thu, 4 Nov 2010 23:34:33 +0000 (16:34 -0700)]
Merge "Parameterize instance counting to include subclasses." into dalvik-dev
Dan Bornstein [Thu, 4 Nov 2010 22:33:35 +0000 (15:33 -0700)]
Use the static opcode chains in dx.
This removes the need to iterate over all possible opcodes looking for
family/format matches whenever the need arises to rewrite an
instruction with a new opcode. This should speed dx up at least a
little, though I don't know if it will be measurable. It's certainly
cleaner and a bit simpler, though.
Change-Id: I779f19cb1249d30f6886faf76670ae37d5dfc402
Carl Shapiro [Thu, 4 Nov 2010 22:12:09 +0000 (15:12 -0700)]
Parameterize instance counting to include subclasses.
Change-Id: Idf54343a6a587e512833bbacbd0f7290adf8517e
Dan Bornstein [Thu, 4 Nov 2010 21:06:28 +0000 (14:06 -0700)]
Merge "Start including the "next opcode" in Dop instances." into dalvik-dev
Andy McFadden [Thu, 4 Nov 2010 20:29:25 +0000 (13:29 -0700)]
Merge "Fix CloseGuard issue in test 087." into dalvik-dev
Andy McFadden [Thu, 4 Nov 2010 20:09:39 +0000 (13:09 -0700)]
Fix CloseGuard issue in test 087.
Need to explicitly close the DexFile.
Change-Id: I15ec8550d3991cf492fbd20c87cb9408d205dd7f
Andy McFadden [Thu, 4 Nov 2010 20:03:57 +0000 (13:03 -0700)]
Merge "Rename wrap/unwrap --> box/unbox" into dalvik-dev
Andy McFadden [Thu, 4 Nov 2010 19:37:51 +0000 (12:37 -0700)]
Rename wrap/unwrap --> box/unbox
Use the correct term when moving primitive values in and out of
their parallel reference types.
Also, turn off the verifyCount check in dvmInvokeMethod unless
assertions are enabled. The verifier guarantees this.
Change-Id: I47629835784b5e770089ab3ca5410ee1c42820d9
Dan Bornstein [Thu, 4 Nov 2010 18:22:35 +0000 (11:22 -0700)]
Start including the "next opcode" in Dop instances.
Nothing's using it yet, though. Coming soon!
Change-Id: Ide34647fce6ad55fe52c8f6012145b724c134799
Elliott Hughes [Thu, 4 Nov 2010 18:03:57 +0000 (11:03 -0700)]
Merge remote branch 'goog/dalvik-dev' into dalvik-dev-to-master
Dan Bornstein [Thu, 4 Nov 2010 17:49:29 +0000 (10:49 -0700)]
Merge "More prep work for new opcodes." into dalvik-dev
Andy McFadden [Thu, 4 Nov 2010 17:40:27 +0000 (10:40 -0700)]
am
d325011f: Shift register index tests to static pass.
* commit '
d325011fc98e0f1179d467bbc284cccea72f560b':
Shift register index tests to static pass.
Andy McFadden [Wed, 3 Nov 2010 21:32:42 +0000 (14:32 -0700)]
Shift register index tests to static pass.
This rather hefty change moves the range tests on register index values
from the code-flow pass to the earlier static analysis pass. The idea
is to test everything up front so that we don't have to do a bounds
check every time we get or set a register value during verification.
This allowed some simplification in the code-flow pass, since get/set
of a register no longer needs to have the method register count passed
in, and can no longer fail due to bad input.
As part of doing this, some of the static verification code was
cleaned up, e.g. the instruction decoding is now only done in one place.
This had no apparently effect on performance on nexus one -- verify+opt
of the bootstrap classes takes the same amount of time. However, it
does reduce the compiled size of the humongous instruction verification
method by about 10%.
Also, cleaned up some instruction format stuff (e.g. removed 3rfs).
Bug
2534655.
(cherry-pick from dalvik-dev)
Change-Id: I1b220f4e97b1214ed575470695c52e1bd64d5137
Dan Bornstein [Thu, 4 Nov 2010 17:17:14 +0000 (10:17 -0700)]
More prep work for new opcodes.
The opcode-gen script now expects there to be up to 65536 opcodes, and
it generates opcode chain information. The chaining info isn't used
yet, but eventually it will get hooked into the instruction selection
logic in dx, meaning that dx will no longer have to do relatively
slower opcode searches; the right "next" opcode will have been
staticly generated and compiled in.
I also added a helpful generated comment in RopToDop, which indicates
which opcodes are the ones that *won't* be found by chaining, that is,
which ones are the starts of chains. This is left as a comment and not
code, though, since there are lots of quirks with how these get hooked
up. I hope to make this cleaner at some point, but today's not the day
for it.
Change-Id: I11da833cc57b383733743114c0f3e0e64903982d
Dan Bornstein [Thu, 4 Nov 2010 00:17:41 +0000 (17:17 -0700)]
Line width / spacing tweak.
Change-Id: Idf9c4f56b24e2b150c519f8ed140650183b47a88
Andy McFadden [Wed, 3 Nov 2010 19:44:13 +0000 (12:44 -0700)]
Improve JNI failure logging.
Removed a couple of LOGD warnings. Added additional detail to the
corresponding exception messages.
Bug
3158451.
Change-Id: I3d1d4e6188f364f592bf396d23c5e7e6da2fe65f
Andy McFadden [Wed, 3 Nov 2010 22:31:17 +0000 (15:31 -0700)]
Merge "Shift register index tests to static pass." into dalvik-dev
Brian Carlstrom [Wed, 3 Nov 2010 18:05:53 +0000 (11:05 -0700)]
Merge remote branch 'goog/dalvik-dev' into dalvik-dev-to-master
Change-Id: I0731a0f623694d15d311dae1450a50e105905421
Andy McFadden [Wed, 3 Nov 2010 21:32:42 +0000 (14:32 -0700)]
Shift register index tests to static pass.
This rather hefty change moves the range tests on register index values
from the code-flow pass to the earlier static analysis pass. The idea
is to test everything up front so that we don't have to do a bounds
check every time we get or set a register value during verification.
This allowed some simplification in the code-flow pass, since get/set
of a register no longer needs to have the method register count passed
in, and can no longer fail due to bad input.
As part of doing this, some of the static verification code was
cleaned up, e.g. the instruction decoding is now only done in one place.
This had no apparently effect on performance on nexus one -- verify+opt
of the bootstrap classes takes the same amount of time. However, it
does reduce the compiled size of the humongous instruction verification
method by about 10%.
Also, cleaned up some instruction format stuff (e.g. removed 3rfs).
Bug
2534655.
Change-Id: I3c2a5877bca5ddc3d794b61a46b95a7e5a3c233f
Dan Bornstein [Tue, 2 Nov 2010 20:49:24 +0000 (13:49 -0700)]
Merge "Rework the bytecode format file and parser." into dalvik-dev
Dan Bornstein [Tue, 2 Nov 2010 20:31:15 +0000 (13:31 -0700)]
Rework the bytecode format file and parser.
This change adds a set of "format" commands to the bytecode.txt file
and prefixes each bytecode definition with an "op" keyword. The new
parser script understands both commands (though it mostly ignores the
"format" ones) and is now a little less wedded to the idea that there
can only be 256 opcodes.
This all is in preparation for (a) adding new opcodes, and (b) making
the opcode/instruction fitter a little more efficient.
Change-Id: I1b4e7274da06b197536823148d91f426d049ec19
Carl Shapiro [Tue, 2 Nov 2010 00:54:39 +0000 (17:54 -0700)]
Merge "Remove allocation limit checking." into dalvik-dev
Carl Shapiro [Mon, 1 Nov 2010 23:26:46 +0000 (16:26 -0700)]
Remove allocation limit checking.
Change-Id: Ie9a23da2baf201c50cad5ba0d0992cec9bcace54
buzbee [Mon, 1 Nov 2010 23:23:53 +0000 (16:23 -0700)]
Merge "JIT - support for return-void-barrier [Issue
2992352]" into dalvik-dev
Carl Shapiro [Mon, 1 Nov 2010 23:17:11 +0000 (16:17 -0700)]
Merge "HPROF is here to stay, make WITH_HPROF the default." into dalvik-dev
Carl Shapiro [Mon, 1 Nov 2010 22:43:18 +0000 (15:43 -0700)]
HPROF is here to stay, make WITH_HPROF the default.
Change-Id: Ic9947461daa21641fd9d34d52b6c7998716d8ab2
buzbee [Mon, 1 Nov 2010 22:53:27 +0000 (15:53 -0700)]
JIT - support for return-void-barrier [Issue
2992352]
Slight reworking of the memory barrier instruction generation to
generalize it, and then add "dmb st" for the new return-void-barrier
instruction.
Change-Id: Iad95aa5b0ba9b616a17dcbe4c6ca2e3906bb49dc
Dan Bornstein [Mon, 1 Nov 2010 19:58:08 +0000 (12:58 -0700)]
Always dump blocks in label order.
This removes some cases of spurious test failure. Also did some
minor whitespace and commenting cleanup while I was in the territory.
Change-Id: I6b8f6d0c340625c31bde78394e77abf429367af3
Carl Shapiro [Mon, 1 Nov 2010 00:54:04 +0000 (17:54 -0700)]
Merge "Check that the debug registry has been started before visting it." into dalvik-dev
Carl Shapiro [Mon, 1 Nov 2010 00:53:56 +0000 (17:53 -0700)]
Merge "Resume all threads after performing an HPROF dump." into dalvik-dev
Carl Shapiro [Sat, 30 Oct 2010 04:32:52 +0000 (21:32 -0700)]
Check that the debug registry has been started before visting it.
Change-Id: I54605ebcb9a07846bbefc61ea48ba9e148a202fb
Carl Shapiro [Sat, 30 Oct 2010 02:08:57 +0000 (19:08 -0700)]
Resume all threads after performing an HPROF dump.
Change-Id: I83df8359a5d57e6b7cd79d75acc979024e50effb
Dan Bornstein [Sat, 30 Oct 2010 01:35:06 +0000 (18:35 -0700)]
am
79544e58: am
464104bb: am
1fe34326: am
fbe51551: (-s ours) Remove a pointless test, which just tested a test support class.
* commit '
79544e584c5a21c2551051732f7daa0b85afac02':
Remove a pointless test, which just tested a test support class.
Dan Bornstein [Sat, 30 Oct 2010 01:33:04 +0000 (18:33 -0700)]
am
464104bb: am
1fe34326: am
fbe51551: (-s ours) Remove a pointless test, which just tested a test support class.
* commit '
464104bb1bc96949d7638aa79d16431e6ab8da78':
Remove a pointless test, which just tested a test support class.
Dan Bornstein [Sat, 30 Oct 2010 01:30:57 +0000 (18:30 -0700)]
am
1fe34326: am
fbe51551: (-s ours) Remove a pointless test, which just tested a test support class.
* commit '
1fe3432661f96bf57b1e3bd91c3c01bd7564e6ae':
Remove a pointless test, which just tested a test support class.
Dan Bornstein [Sat, 30 Oct 2010 01:29:27 +0000 (18:29 -0700)]
am
fbe51551: (-s ours) Remove a pointless test, which just tested a test support class.
* commit '
fbe515510323ee65ce594b8eda5547c1cbfb8ad9':
Remove a pointless test, which just tested a test support class.
Dan Bornstein [Sat, 30 Oct 2010 01:23:19 +0000 (18:23 -0700)]
Remove a pointless test, which just tested a test support class.
Change-Id: Ia6d47860ad71f013fef5631bcd434c2f6f1d346f
Dan Bornstein [Sat, 30 Oct 2010 00:05:43 +0000 (17:05 -0700)]
am
99bb6ef3: am
32d0157d: am
66b96b42: am
3144eec0: (-s ours) Replace the implementation of this class.
* commit '
99bb6ef3043d4628e6e0da012df9920cd31735ce':
Replace the implementation of this class.
Dan Bornstein [Sat, 30 Oct 2010 00:04:21 +0000 (17:04 -0700)]
am
32d0157d: am
66b96b42: am
3144eec0: (-s ours) Replace the implementation of this class.
* commit '
32d0157dfef33fa48d195d2a467dd511ec7ef347':
Replace the implementation of this class.
Dan Bornstein [Sat, 30 Oct 2010 00:02:39 +0000 (17:02 -0700)]
am
66b96b42: am
3144eec0: (-s ours) Replace the implementation of this class.
* commit '
66b96b42ba1d21027b71ca65821648925c661a78':
Replace the implementation of this class.
Dan Bornstein [Sat, 30 Oct 2010 00:00:32 +0000 (17:00 -0700)]
am
3144eec0: (-s ours) Replace the implementation of this class.
* commit '
3144eec027b6a0de24f024c286e4544b1aca683b':
Replace the implementation of this class.
Carl Shapiro [Fri, 29 Oct 2010 22:35:17 +0000 (15:35 -0700)]
Merge "Reclassify the pin table as a VM internal root. The native stack classification requires an associated thread but are not directly associated with a thread. If we encounter an object in the pin table during an hprof dump hat will fail." into dalvik-dev
Dan Bornstein [Fri, 29 Oct 2010 22:27:54 +0000 (15:27 -0700)]
Replace the implementation of this class.
Use the Apache Harmony version.
Change-Id: Ica3b4c69ccd1cd4c91325c52fad5a71695d58ba4
Carl Shapiro [Fri, 29 Oct 2010 22:14:28 +0000 (15:14 -0700)]
Reclassify the pin table as a VM internal root. The native stack
classification requires an associated thread but are not directly
associated with a thread. If we encounter an object in the pin table
during an hprof dump hat will fail.
Change-Id: I9e49f88cd632584b5818c702cf80f3f96ec5da85
Dan Bornstein [Fri, 29 Oct 2010 20:01:27 +0000 (13:01 -0700)]
A bunch of minor cleanups.
I'm reacquainting myself with this code, and figured I might as well
do some of that nit-picky code convention tweakage while I was there.
The only non-whitespace non-comment changes I made were to change the
scope of a couple of methods to be more appropriate.
Change-Id: I550978ed0f5b9ccec938faef7c00d09532832ee4
Dan Bornstein [Fri, 29 Oct 2010 03:11:53 +0000 (20:11 -0700)]
Fix expected output of dx test 086.
It experienced both innocuous block order shift and changes to
content due to the earlier constant value propagation fix.
Change-Id: If97d9cc82e763e9bbd7c3a8ba834f2d994eb694b
Dan Bornstein [Fri, 29 Oct 2010 03:11:19 +0000 (20:11 -0700)]
Merge "Fix the expected output of dx test 083." into dalvik-dev
Dan Bornstein [Fri, 29 Oct 2010 03:08:00 +0000 (20:08 -0700)]
Fix the expected output of dx test 083.
The recent fix to constant value propagation altered the expected output.
Change-Id: I57a2c1d60f2bc1060e116199d7924944ca1eef43
Carl Shapiro [Wed, 27 Oct 2010 04:07:41 +0000 (21:07 -0700)]
Separate HPROF from the GC.
In the beginning, the only way to traverse the roots and heap was to
piggyback off the garbage collector. As such, HPROF was implemented
by instrumenting the root- and object traversal routines to check a
mode flag and call into HPROF during a GC when the flag was set.
This change moves the HPROF calls out of the GC and into callbacks
invoked through the visitor. Notably, it allows HPROF dumps to be
computed at any point in time without invoking a GC and potentially
destroying evidence relating to the cause of an OOM.
Change-Id: I2b74c4f10f35af3ca33b7c0bbfe470a8b586ff66
Dan Bornstein [Fri, 29 Oct 2010 00:44:06 +0000 (17:44 -0700)]
Fix dx test 087.
This is another case of block rearrangement.
Change-Id: I402d0056f8b6d314cef2efcfea80337777b20a7d
Dan Bornstein [Fri, 29 Oct 2010 00:37:08 +0000 (17:37 -0700)]
Update the expected.txt for dx test 094.
As with a couple previous cases, it looks like the block order
has changed in the output, which isn't significant.
Change-Id: I4aef1da2252b3994875349570aca21043144eed4
Dan Bornstein [Thu, 28 Oct 2010 16:54:57 +0000 (09:54 -0700)]
Up the version number.
Change-Id: Ibf1e0471d1991c0b9ef7df847b427a3aead6fd4d
Dan Bornstein [Wed, 27 Oct 2010 23:30:00 +0000 (16:30 -0700)]
Fix propagation of constants.
In particular, when constructing a rop instruction for a move, if
the source has a known constant value, make the target end up also
having that value.
Change-Id: If172337889134e4a682bb0d8eb4e07ca284ac80e
jeffhao [Fri, 22 Oct 2010 00:44:43 +0000 (17:44 -0700)]
Added multi-threaded support to processing of class files in dx.
Change-Id: Ideb54c414073a9651b21ce0697e6444fa80f146d
Dan Bornstein [Wed, 27 Oct 2010 22:39:49 +0000 (15:39 -0700)]
Clean up dx test 085.
The jasmin source had a bug which dx didn't previously catch, which is
now fixed, and I also removed a superfluous <init> method. With that
cleaned up, the test now fails but in a different way, which I believe
is indicative of a real problem, where it looks like a known constant
value is not getting properly propagated.
Change-Id: I3d31045eecc6d71cff2bca98c948dc58371d35a1
Dan Bornstein [Wed, 27 Oct 2010 22:09:29 +0000 (15:09 -0700)]
Dx test 083's expected output was wrong.
Like many of these tests, the expected output may change from time to
time due to irrelevant (to the test) changes to unrelated parts of dx.
In this case, at some point the rop block dumper seems to have started
sorting its blocks by label.
Change-Id: Ic82cdf8c7f98713bb67e4267c5dc91f0836a859d
Dan Bornstein [Wed, 27 Oct 2010 21:35:07 +0000 (14:35 -0700)]
Merge "The failure of dx test 105 wasn't actually spurious. Fixed the code." into dalvik-dev
Andy McFadden [Wed, 27 Oct 2010 20:32:07 +0000 (13:32 -0700)]
am
cd507233: am
7f91cf6b: am
3cf48016: Set capabilities sooner.
Andy McFadden [Wed, 27 Oct 2010 20:28:22 +0000 (13:28 -0700)]
am
7f91cf6b: am
3cf48016: Set capabilities sooner.
Andy McFadden [Wed, 27 Oct 2010 20:25:34 +0000 (13:25 -0700)]
am
3cf48016: Set capabilities sooner.
Andy McFadden [Wed, 27 Oct 2010 18:25:13 +0000 (11:25 -0700)]
Set capabilities sooner.
Bug
3135433.
Change-Id: I22fde728bd5d65774f8fdf1fa45956fe18358c4c
buzbee [Wed, 27 Oct 2010 19:49:48 +0000 (12:49 -0700)]
Merge "x86: Improve ArrayIndexOutOfBoundsException detail messages" into dalvik-dev
Dan Bornstein [Wed, 27 Oct 2010 18:51:16 +0000 (11:51 -0700)]
The failure of dx test 105 wasn't actually spurious. Fixed the code.
In particular, for array load and store instructions, dx was being too
aggressive about letting the contents of the stack override the
implied type expected by the instructions. This led to cases where dx
would emit code instead of reporting an error.
The failure on the array load side of things implied that there also
needed to be a new regression test on the store side, since the
existing array store test didn't catch this. So, I added that too in
this change.
Finally, I took this opportunity to do minor whitespace-type cleanups
in a couple of related files that I opened during the course of the
investigation.
Change-Id: I72c644f66afb1108ae43a129ac81b010d072155a
buzbee [Wed, 27 Oct 2010 18:33:15 +0000 (11:33 -0700)]
x86: Improve ArrayIndexOutOfBoundsException detail messages
issue
3122084
Changes the x86 interpreter to use the new dvmThrowAIOOBE call
for out of bounds exception w/ more useful info.
Change-Id: Ic196cc99c561bf31953993a6928f574e5c5bf831
Elliott Hughes [Wed, 27 Oct 2010 18:24:59 +0000 (11:24 -0700)]
Merge "Remove nio cruft." into dalvik-dev
Elliott Hughes [Wed, 27 Oct 2010 17:11:12 +0000 (10:11 -0700)]
Remove nio cruft.
Change-Id: Ie0dd478f499e9fa40a4af8f10b81df7144a3e813
Dan Bornstein [Tue, 26 Oct 2010 23:23:07 +0000 (16:23 -0700)]
Fix a test.
The expected output was wrong. (A previous dx change made the output in
the case in question better.)
Change-Id: I94a180efc83968197d7a0a0fad49cdc6e02338cb
Andy McFadden [Tue, 26 Oct 2010 23:00:38 +0000 (16:00 -0700)]
Merge "Properly close <address> tag." into dalvik-dev
Andy McFadden [Tue, 26 Oct 2010 22:59:58 +0000 (15:59 -0700)]
Properly close <address> tag.
Change-Id: I4f86849de25f1d1a35f2356c1f118f3f063674a4
Jeff Hao [Tue, 26 Oct 2010 21:35:54 +0000 (14:35 -0700)]
Merge "Implement the new instruction formats." into dalvik-dev
Andy McFadden [Tue, 26 Oct 2010 19:36:50 +0000 (12:36 -0700)]
Merge "Improve dexdump temp file handling." into dalvik-dev
Dan Bornstein [Tue, 26 Oct 2010 19:00:07 +0000 (12:00 -0700)]
Implement the new instruction formats.
I also refactored some of the old code in the process, to minimize
duplication, and I also did a minor cleanup of the format spec.
Change-Id: Ib07ea4ade52aa6ec4fa69000798e0cfb8f10c3a9
Ben Cheng [Tue, 26 Oct 2010 17:20:43 +0000 (10:20 -0700)]
am
0b33af0c: am
5d992dfa: am
36bd1345: Fix for array lower-bound check for count-down loops.
Ben Cheng [Tue, 26 Oct 2010 17:18:38 +0000 (10:18 -0700)]
am
5d992dfa: am
36bd1345: Fix for array lower-bound check for count-down loops.
Ben Cheng [Tue, 26 Oct 2010 17:16:28 +0000 (10:16 -0700)]
am
36bd1345: Fix for array lower-bound check for count-down loops.
Andy McFadden [Tue, 26 Oct 2010 14:44:13 +0000 (07:44 -0700)]
Merge "Correct verifier merging of primitive arrays" into dalvik-dev
Ben Cheng [Tue, 26 Oct 2010 03:54:31 +0000 (20:54 -0700)]
Fix for array lower-bound check for count-down loops.
If the counted loop is composed as
for (int i = hi; i >= lo; i--) {
.. = array[i];
}
The hoisted lower-bound check should be asserting "lo >= 0".
On the other hand if the counted loop is composed as
for (int i = hi; i > lo; i--) {
.. = array[i];
}
The hoisted lower-bound check should be asserting "lo + 1 >= 0".
Previously these two checks are reversed.
Bug:
3130818
Change-Id: Ibc5a6daa837880e9986e45bbc29d1a5e548be3ae
Andy McFadden [Mon, 25 Oct 2010 23:13:46 +0000 (16:13 -0700)]
Correct verifier merging of primitive arrays
Merging of primitive array types (e.g. float[][] + String[]) was being
handled by the general-purpose type merge, which was determining the
result to be an Object. It should have been an Object[].
This changes the verifier to treat arrays of primitive as arrays, but
with one fewer dimension.
Bug:
3130586
Change-Id: I35a6c27256f69f142fa2a8c22bc5f995096c9ae1
Andy McFadden [Mon, 25 Oct 2010 20:29:43 +0000 (13:29 -0700)]
Improve dexdump temp file handling.
When dexdump is handed a zip or APK, it has to unpack classes.dex to a
temp file. It currently tries /tmp and /sdcard, neither of which are
likely to exist on a Windows system.
We now print a warning when those directories don't exist, and try to
create the temp file in the current directory.
Bug
3125957.
Change-Id: I7724ce48c35f22ed4b5116dfe5783243107df6a1
Jeff Hao [Mon, 25 Oct 2010 18:04:36 +0000 (11:04 -0700)]
Merge "A little instruction format housecleaning and prep work." into dalvik-dev
Dan Bornstein [Mon, 25 Oct 2010 01:30:58 +0000 (18:30 -0700)]
A little instruction format housecleaning and prep work.
Change-Id: Iea9d79d23515090f75cdc32c2123dbfb56e27d3c
Andy McFadden [Mon, 25 Oct 2010 14:56:01 +0000 (07:56 -0700)]
Merge "Allow nested instruction counting." into dalvik-dev
Andy McFadden [Mon, 25 Oct 2010 14:55:05 +0000 (07:55 -0700)]
Merge "Lock thread list, show join target" into dalvik-dev
Andy McFadden [Fri, 22 Oct 2010 22:26:07 +0000 (15:26 -0700)]
Allow nested instruction counting.
It is traditional to store counts in variables with more than one
bit of storage.
Also, fixed some of the decorations.
Bug
2863796.
Change-Id: I167d6803e955159e35e75d1e2924754145ea1361