Merge change 24036

* changes:
  Reduce a log message, stifle a gcc warning.

Reduce a log message, stifle a gcc warning.

Merge change 23992

* changes:
  Inline Sqrt bug fix; add support for fp/gen register copies

am ed216806: am f2f6f8b8: Document that createSocketFileDescriptor throws an exception on failure.

Merge commit 'ed21680602783711c7dac9675ae65ad329a050c1'

* commit 'ed21680602783711c7dac9675ae65ad329a050c1':
  Document that createSocketFileDescriptor throws an exception on failure.

am f2f6f8b8: Document that createSocketFileDescriptor throws an exception on failure.

Merge commit 'f2f6f8b8d47733be0f291612730690b5ce379257' into eclair-plus-aosp

* commit 'f2f6f8b8d47733be0f291612730690b5ce379257':
  Document that createSocketFileDescriptor throws an exception on failure.

Document that createSocketFileDescriptor throws an exception on failure.

Change-Id: Ic002b4dc8c40d798316afbab7a14bd81593e2541

Inline Sqrt bug fix; add support for fp/gen register copies

am f751aeb1: am 3a4e4249: Merge change 23983 into eclair

Merge commit 'f751aeb179cd531df610689217f36e760bd25639'

* commit 'f751aeb179cd531df610689217f36e760bd25639':
  If an error occurs when creating a socket, don't call any more JNI methods

am 3a4e4249: Merge change 23983 into eclair

Merge commit '3a4e4249032009b175ba6a3d0bcc682f97e5e650' into eclair-plus-aosp

* commit '3a4e4249032009b175ba6a3d0bcc682f97e5e650':
  If an error occurs when creating a socket, don't call any more JNI methods

Merge change 23983 into eclair

* changes:
  If an error occurs when creating a socket, don't call any more JNI methods (thus causing a segfault) but return immediately.

If an error occurs when creating a socket, don't call any more JNI methods
(thus causing a segfault) but return immediately.

Change-Id: I7d05997e38e631200542f85eba16b854d488d584

am 4fa89f9d: am 09302d63: Merge change 23572 into eclair

Merge commit '4fa89f9d9af93f9d3b9125430160818f456aed5a'

* commit '4fa89f9d9af93f9d3b9125430160818f456aed5a':
  Do not check hash codes against golden values. Instead, spot check that they

am 614eb57f: merge from open-source master

Merge commit '614eb57fffcc5abe5c933452d297fdaa4ae98176'

* commit '614eb57fffcc5abe5c933452d297fdaa4ae98176':

am d312ee58: am 02e04f8b: Merge change 22871 into eclair

Merge commit 'd312ee58231aeb808cbed1083801413ba080ceac'

* commit 'd312ee58231aeb808cbed1083801413ba080ceac':
  More InetAddress fixes.

am 5765fb64: (-s ours) am 365f9fbb: Merge change 23918 into eclair

Merge commit '5765fb64620d955a0bcadd14cb35f9a95df69072'

* commit '5765fb64620d955a0bcadd14cb35f9a95df69072':
  do not merge: Josh's optimized HashMap and Hashtable

am 09302d63: Merge change 23572 into eclair

Merge commit '09302d631adbdc36edd3ec961149b8f0fe1931f1' into eclair-plus-aosp

* commit '09302d631adbdc36edd3ec961149b8f0fe1931f1':
  Do not check hash codes against golden values. Instead, spot check that they

Merge change 23572 into eclair

* changes:
  Do not check hash codes against golden values. Instead, spot check that they differ for different addresses and obvious values (e.g., 0 or 1) that might be returned by buggy implementations.

merge from open-source master

am 02e04f8b: Merge change 22871 into eclair

Merge commit '02e04f8b1e41ce341fd765a4f9086f4b2360cfd0' into eclair-plus-aosp

* commit '02e04f8b1e41ce341fd765a4f9086f4b2360cfd0':
  More InetAddress fixes.

Merge change 22871 into eclair

* changes:
  More InetAddress fixes.

More InetAddress fixes.

1. Make sure getHostByAddrImpl actually throws UnknownHostException: set
   NI_NAMEREQD when calling getnameinfo to ensure it will fail if the IP
   address looked up does not have a name associated with it, and pass this
   exception back to the Java code. That way, the UnknownHostException passed
   back to the Java code has information on what went wrong.
2. Remove superfluous logging on reverse lookups in the C code.

Change-Id: Ie195ce1f12e7b43fbf75f494002804f9db68fd8c

am 365f9fbb: Merge change 23918 into eclair

Merge commit '365f9fbb3e5444f046ee569f168a231c8106ec09' into eclair-plus-aosp

* commit '365f9fbb3e5444f046ee569f168a231c8106ec09':
  do not merge: Josh's optimized HashMap and Hashtable

Merge change 23918 into eclair

* changes:
  do not merge: Josh's optimized HashMap and Hashtable

do not merge: Josh's optimized HashMap and Hashtable

This commit squashes two changes from master. The only
additional change is that I've added "implements Map<K, V>"
to the signature of HashMap, which is necessary until we
get Josh's Apicheck fix in the master branch.

commit 5483e8adebc09b7bc58eb568793868388c240116
Author: Joshua Bloch <jjb@google.com>
Date:   Mon Aug 31 17:55:19 2009 -0700

    Replaced existing Hashtable implementation with fast one.

commit 90dbc304086ba1f6f51ed0d0b3a7368cc0fd46cb
Author: Joshua Bloch <jjb@google.com>
Date:   Thu Aug 20 17:34:39 2009 -0700

    Replace existing HashMap and LinkedHashMap with faster versions.
    Among other optimizations, the new versions do no division and
    use a high-quality defensive hash function to minimize the odds
    of poor key distribution among buckets.  Third time's a charm.

Various bug fixes for armv5 and loop/self-verification co-existence.

Fixed the out-of-bound problem for RegImm compares when imm cannot be encoded.

Renamed insertRegRegCheck to genRegRegCheck to be consistent with other code.

Fixed the loop formation code to break out of the tight loop in each iteration
when self-verification is enabled.

Merge change 23876

* changes:
  Update the JIT to use the new indexAt() inline native routines.

Merge change 23891

* changes:
  Minor fix.

Minor fix.

Added a couple of allocation failure checks.  For 1332727.

merge from donut

am 01d30203: am 16866f9c: Merge change 23208 into eclair

Merge commit '01d30203b6dc48ed648778f8c93767ed65fe2ac4'

* commit '01d30203b6dc48ed648778f8c93767ed65fe2ac4':
  Fix Class.getConstructor("whatever", (Class[]) null).

am 16866f9c: Merge change 23208 into eclair

Merge commit '16866f9c1fcfe8b1d1103424ed901517ce60883a' into eclair-plus-aosp

* commit '16866f9c1fcfe8b1d1103424ed901517ce60883a':
  Fix Class.getConstructor("whatever", (Class[]) null).

Merge change 23208 into eclair

* changes:
  Fix Class.getConstructor("whatever", (Class[]) null).

Update the JIT to use the new indexAt() inline native routines.

Merge change 23857

* changes:
  Add inline version of String.indexOf().

Fix Class.getConstructor("whatever", (Class[]) null).

The RI treats null parameterTypes the same as an empty array.
This behavior is specified for getMethod, but only implied for getConstructor.

This patch:

* Fixes getConstructor.
* Improves javadoc for Class methods taking "Class... parameterTypes".
* Adds tests for both getConstructor and getMethod (which was already correct).
* Removes a line of debugging output to System.out.

Bug: 1824973

Add inline version of String.indexOf().

This provides an inline-native version of String.indexOf(int) and
String.indexOf(int, int), i.e. the functions that work like strchr().
Has a fairly solid impact on specific benchmarks.  Might give a boost to
an app somewhere.

Added some indexOf tests to 020-string.

Added hard-coded field offsets for String.  These are verified during
startup.  Improves some of our String micro-benchmarks by ~10%.

am 0cc58014: am 74d65387: Update GlobalSign Root CA to one that expires in 2028.

Merge commit '0cc580141a3139d80ef683c197158d1ebb7b8ccc'

* commit '0cc580141a3139d80ef683c197158d1ebb7b8ccc':
  Update GlobalSign Root CA to one that expires in 2028.

am 74d65387: Update GlobalSign Root CA to one that expires in 2028.

Merge commit '74d65387394ddf242ca01db4e4d88e6374c74ed4' into eclair-plus-aosp

* commit '74d65387394ddf242ca01db4e4d88e6374c74ed4':
  Update GlobalSign Root CA to one that expires in 2028.

Update GlobalSign Root CA to one that expires in 2028.

am 7fe78291: am ce90979d: Merge change 23480 into eclair

Merge commit '7fe782915199f03ec8e7484d2db35c9cb948770c'

* commit '7fe782915199f03ec8e7484d2db35c9cb948770c':
  Add Entrust root and intermediate certs.

am ce90979d: Merge change 23480 into eclair

Merge commit 'ce90979d06ae2e0832f3a11a7a4a0c0281de75df' into eclair-plus-aosp

* commit 'ce90979d06ae2e0832f3a11a7a4a0c0281de75df':
  Add Entrust root and intermediate certs.

Merge change 23480 into eclair

* changes:
  Add Entrust root and intermediate certs.

am df836c58: am 91191d3e: Merge change 22771 into eclair

Merge commit 'df836c58934fd1f7ec4d7de57cd1c053399f89bb'

* commit 'df836c58934fd1f7ec4d7de57cd1c053399f89bb':
  Don't mutate input in OSMemory.setIntArray/setShortArray.

am 91191d3e: Merge change 22771 into eclair

Merge commit '91191d3e208d3a7c25c03e40018729877f954926' into eclair-plus-aosp

* commit '91191d3e208d3a7c25c03e40018729877f954926':
  Don't mutate input in OSMemory.setIntArray/setShortArray.

Merge change 22771 into eclair

* changes:
  Don't mutate input in OSMemory.setIntArray/setShortArray.

am 2df5f5af: (-s ours) am 4b8a5527: Merge change 23683 into eclair

Merge commit '2df5f5af614570c109403b0f912faf71868f204a'

* commit '2df5f5af614570c109403b0f912faf71868f204a':
  DO NOT MERGE: Fix implementation of Thread.isAlive

am 4b8a5527: Merge change 23683 into eclair

Merge commit '4b8a55273e4cdc9d17d5c0e4eef1384ceb20c571' into eclair-plus-aosp

* commit '4b8a55273e4cdc9d17d5c0e4eef1384ceb20c571':
  DO NOT MERGE: Fix implementation of Thread.isAlive

Merge change 23683 into eclair

* changes:
  DO NOT MERGE: Fix implementation of Thread.isAlive

am 13f08cfc: am ed974e9e: Merge change 23724 into eclair

Merge commit '13f08cfc9e6919e39ef5036715c3dc171d4f698b'

* commit '13f08cfc9e6919e39ef5036715c3dc171d4f698b':
  Fix x86 call bridge

am ed974e9e: Merge change 23724 into eclair

Merge commit 'ed974e9ea6220b363d2f093d1a2d4bf4b8f3c429' into eclair-plus-aosp

* commit 'ed974e9ea6220b363d2f093d1a2d4bf4b8f3c429':
  Fix x86 call bridge

Merge change 23724 into eclair

* changes:
  Fix x86 call bridge

Fix x86 call bridge

Merge change 23384

* changes:
  Replaced existing Hashtable implementation with fast one.

am 304fcb28: am 793f1423: Merge change 23675 into eclair

Merge commit '304fcb28d7b63219e9d52423d08a41b4f6be5df1'

* commit '304fcb28d7b63219e9d52423d08a41b4f6be5df1':
  Unbreak Dalvik VM initialization due to a native method that expects to be able

am 793f1423: Merge change 23675 into eclair

Merge commit '793f142323c49818ad022a05cbfb931eefddae5b' into eclair-plus-aosp

* commit '793f142323c49818ad022a05cbfb931eefddae5b':
  Unbreak Dalvik VM initialization due to a native method that expects to be able

Merge change 23675 into eclair

* changes:
  Unbreak Dalvik VM initialization due to a native method that expects to be able to call an InetAddress no-args constructor. This constructor was package-private and was recently removed. This method is horribly complex and should go away (it probably doesn't even work, due to it attempting to find a class known as "java/io/FielDescriptor"), but it needs to be fixed for now.

Unbreak Dalvik VM initialization due to a native method that expects to be able
to call an InetAddress no-args constructor. This constructor was package-private
and was recently removed. This method is horribly complex and should go away (it
probably doesn't even work, due to it attempting to find a class known as
"java/io/FielDescriptor"), but it needs to be fixed for now.

Change-Id: I56b1e0e07f4c97af82e0a4f14dfd2d8af16f6b82

DO NOT MERGE: Fix implementation of Thread.isAlive

(Originally submitted to master, pulling over to eclair.)

The implementation of Thread.isAlive() was changed a couple of years ago
as part of the Harmony integration.  The current version relies on the
thread's state value to determine its liveness, but the VM was
originally written to be like JamVM, which used GNU ClassPath, which
uses the vmThread field instead.

It looks like it's possible for Thread.join() to get stuck, though as
far as I know this hasn't happened.

We're essentially rolling back part of 27774-p9.  For internal bug 1966734.

Also: ran --update on test 044.

am d679e7fb: am c19d2a1d: Fix two calls to memset(3) whose arguments were reversed.

Merge commit 'd679e7fbd5df8f178aa0751e107580fc51208373'

* commit 'd679e7fbd5df8f178aa0751e107580fc51208373':
  Fix two calls to memset(3) whose arguments were reversed.

am c19d2a1d: Fix two calls to memset(3) whose arguments were reversed.

Merge commit 'c19d2a1d798d8626f196d878abcf23a14bee40af' into eclair-plus-aosp

* commit 'c19d2a1d798d8626f196d878abcf23a14bee40af':
  Fix two calls to memset(3) whose arguments were reversed.

Fix two calls to memset(3) whose arguments were reversed.

External bug 3358 reported the libcore/x-net instance. Manual inspection
turned up another instance in vm, but nothing else in the dalvik package.

Tested by booting sapphire-eng and running the x-net tests.

Bug: 1999244

am 0882b5ca: am 5ca29e14: Merge change 22629 into eclair

Merge commit '0882b5ca179ef3ce0db861b99a038f45fa00a47d'

* commit '0882b5ca179ef3ce0db861b99a038f45fa00a47d':
  Fix "whatever".split(".") behavior.

Merge change 23662

* changes:
  Reorder the taken and fallthroug blocks and remove dead branches.

Reorder the taken and fallthroug blocks and remove dead branches.

In the following example the order of the two chaining cells are reversed and
the branch to 0x42862ce4 is eliminated.

Before:

D/dalvikvm( 1550): 0x42862cd6 (000a): bge     0x42862cdc
D/dalvikvm( 1550): 0x42862cd8 (000c): b       0x42862ce4
D/dalvikvm( 1550): Exception_Handling:
D/dalvikvm( 1550): 0x42862cda (000e): .align4
D/dalvikvm( 1550): -------- chaining cell (normal): 0x0049
D/dalvikvm( 1550): 0x42862cdc (0010): ldr     r0, [r6, #76]
D/dalvikvm( 1550): 0x42862cde (0012): blx     r0
D/dalvikvm( 1550): 0x42862ce0 (0014): data    0x1512(5394)
D/dalvikvm( 1550): 0x42862ce2 (0016): data    0x42a7(17063)
D/dalvikvm( 1550): 0x42862ce4 (0018): .align4
D/dalvikvm( 1550): -------- chaining cell (normal): 0x001d
D/dalvikvm( 1550): 0x42862ce4 (0018): ldr     r0, [r6, #76]
D/dalvikvm( 1550): 0x42862ce6 (001a): blx     r0
D/dalvikvm( 1550): 0x42862ce8 (001c): data    0x14ba(5306)
D/dalvikvm( 1550): 0x42862cea (001e): data    0x42a7(17063)

After:

D/dalvikvm(  367): 0x42865c92 (000a): bge     0x42865c9c
D/dalvikvm(  367): Exception_Handling:
D/dalvikvm(  367): 0x42865c94 (000c): .align4
D/dalvikvm(  367): -------- chaining cell (normal): 0x001d
D/dalvikvm(  367): 0x42865c94 (000c): ldr     r0, [r6, #76]
D/dalvikvm(  367): 0x42865c96 (000e): blx     r0
D/dalvikvm(  367): 0x42865c98 (0010): data    0x44ba(17594)
D/dalvikvm(  367): 0x42865c9a (0012): data    0x42a7(17063)
D/dalvikvm(  367): 0x42865c9c (0014): .align4
D/dalvikvm(  367): -------- chaining cell (normal): 0x0049
D/dalvikvm(  367): 0x42865c9c (0014): ldr     r0, [r6, #76]
D/dalvikvm(  367): 0x42865c9e (0016): blx     r0
D/dalvikvm(  367): 0x42865ca0 (0018): data    0x4512(17682)
D/dalvikvm(  367): 0x42865ca2 (001a): data    0x42a7(17063)

am 5ca29e14: Merge change 22629 into eclair

Merge commit '5ca29e142032b6559824e4f7d526bbc037b90c93' into eclair-plus-aosp

* commit '5ca29e142032b6559824e4f7d526bbc037b90c93':
  Fix "whatever".split(".") behavior.

Merge change 22629 into eclair

* changes:
  Fix "whatever".split(".") behavior.

Do not check hash codes against golden values. Instead, spot check that they
differ for different addresses and obvious values (e.g., 0 or 1) that might be
returned by buggy implementations.

Change-Id: I4c093ccc268c91fc256b4ba76e1243de2d27670d

am 0f45017c: am 94e11fc4: InetAddress refactoring.

Merge commit '0f45017ce76906ed4c43b60a4538607e5171294f'

* commit '0f45017ce76906ed4c43b60a4538607e5171294f':
  InetAddress refactoring.

am 94e11fc4: InetAddress refactoring.

Merge commit '94e11fc41d9bb7648932a21be7fa895c2432f610' into eclair-plus-aosp

* commit '94e11fc41d9bb7648932a21be7fa895c2432f610':
  InetAddress refactoring.

Replaced existing Hashtable implementation with fast one.

Merge change 23487

* changes:
  Fix implementation of Thread.isAlive().

InetAddress refactoring.

1. Refactor all protocol-specific methods from InetAddress into Inet[46]Address.
2. Move all protocol-specific constants from InetAddress into Inet[46]Address.

This change should have no effect on the stack's behaviour but makes it easy to
find parts of the code that still have dependencies on IPv4 so they can be
examined and fixed.

Change-Id: I70860ee04cf7c01bffaa35c8c64199f69d99826f

Fix implementation of Thread.isAlive().

The implementation of Thread.isAlive() was changed a couple of years ago
as part of the Harmony integration.  The current version relies on the
thread's state value to determine its liveness, but the VM was
originally written to be like JamVM, which used GNU ClassPath, which
uses the vmThread field instead.

It looks like it's possible for Thread.join() to get stuck, though as
far as I know this hasn't happened.

We're essentially rolling back part of 27774-p9.  For internal bug 1966734.

Also: ran --update on test 044.

Add Entrust root and intermediate certs.

am 9c92c48f: merge from open-source master

Merge commit '9c92c48fee7d97e9218e780d32b872eb97962629'

* commit '9c92c48fee7d97e9218e780d32b872eb97962629':
  Add a bit-map encoding of Object-reference field offsets to ClassObject.
  Be more POSIXly correct in the use of expr.
  Fix broken link in docstring. issue 1194
  libcore/.../rg_apache_harmony_xml_ExpatParser: in C++, the return type

Implement SSA-based loop optimizations.

For traces of simple natural loops (ie no invokes/side exits) null and range
checks will be hoisted in to entry block.

For acyclic traces SSA representation will be formed but no optimizations are
 applied (for now).

SSA representation will be printed with the normal verbose output. For example:

D/dalvikvm( 1248): Dumping LIR insns
D/dalvikvm( 1248): installed code is at 0x428559d4
D/dalvikvm( 1248): total size is 324 bytes
D/dalvikvm( 1248): 0x428559d4 (0000): data    0x012c(300)
D/dalvikvm( 1248): -------- entry offset: 0x002b
D/dalvikvm( 1248): -------- MIR_OP_NULL_N_RANGE_UP_CHECK
D/dalvikvm( 1248): 0x428559d6 (0002): ldr     r0, [r5, #36]
D/dalvikvm( 1248): 0x428559d8 (0004): ldr     r1, [r5, #12]
D/dalvikvm( 1248): 0x428559da (0006): cbz     r0,0x42855a06
D/dalvikvm( 1248): 0x428559dc (0008): ldr     r0, [r0, #8]
D/dalvikvm( 1248): 0x428559de (000a): subs    r1, #1
D/dalvikvm( 1248): 0x428559e0 (000c): cmp     r1, r0
D/dalvikvm( 1248): 0x428559e2 (000e): bge     0x42855a06
D/dalvikvm( 1248): -------- MIR_OP_NULL_N_RANGE_UP_CHECK
D/dalvikvm( 1248): 0x428559e4 (0010): ldr     r0, [r5, #40]
D/dalvikvm( 1248): 0x428559e6 (0012): ldr     r1, [r5, #12]
D/dalvikvm( 1248): 0x428559e8 (0014): cbz     r0,0x42855a06
D/dalvikvm( 1248): 0x428559ea (0016): ldr     r0, [r0, #8]
D/dalvikvm( 1248): 0x428559ec (0018): subs    r1, #1
D/dalvikvm( 1248): 0x428559ee (001a): cmp     r1, r0
D/dalvikvm( 1248): 0x428559f0 (001c): bge     0x42855a06
D/dalvikvm( 1248): -------- MIR_OP_NULL_N_RANGE_UP_CHECK
D/dalvikvm( 1248): 0x428559f2 (001e): ldr     r0, [r5, #32]
D/dalvikvm( 1248): 0x428559f4 (0020): ldr     r1, [r5, #12]
D/dalvikvm( 1248): 0x428559f6 (0022): cbz     r0,0x42855a06
D/dalvikvm( 1248): 0x428559f8 (0024): ldr     r0, [r0, #8]
D/dalvikvm( 1248): 0x428559fa (0026): cmp     r1, r0
D/dalvikvm( 1248): 0x428559fc (0028): bge     0x42855a06
D/dalvikvm( 1248): -------- MIR_OP_LOWER_BOUND_CHECK
D/dalvikvm( 1248): 0x428559fe (002a): ldr     r0, [r5, #44]
D/dalvikvm( 1248): 0x42855a00 (002c): cmp     r0, #1
D/dalvikvm( 1248): 0x42855a02 (002e): blt     0x42855a06
D/dalvikvm( 1248): 0x42855a04 (0030): b       0x42855a08
D/dalvikvm( 1248): 0x42855a06 (0032): b       0x42855af0
D/dalvikvm( 1248): L0x002b:
D/dalvikvm( 1248): -------- MIR_OP_PHI
D/dalvikvm( 1248): -------- s20(v11_1) <- s11(v11_0) s46(v11_2)
D/dalvikvm( 1248): -------- dalvik offset: 0x002b @ aget-wide
D/dalvikvm( 1248): -------- s21(v12_1) s22(v13_1) <- s9(v9_0) s20(v11_1)
D/dalvikvm( 1248): 0x42855a08 (0034): ldr     r2, [r5, #36]
D/dalvikvm( 1248): 0x42855a0a (0036): ldr     r3, [r5, #44]
D/dalvikvm( 1248): 0x42855a0c (0038): adds    r2, r2, #16
D/dalvikvm( 1248): 0x42855a0e (003a): lsls    r3, r3, #3
D/dalvikvm( 1248): 0x42855a10 (003c): ldr     r0, [r2, r3]
D/dalvikvm( 1248): 0x42855a12 (003e): adds    r2, r2, #4
D/dalvikvm( 1248): 0x42855a14 (0040): ldr     r1, [r2, r3]
D/dalvikvm( 1248): -------- dalvik offset: 0x002d @ aget-wide
D/dalvikvm( 1248): -------- s23(v14_1) s24(v15_1) <- s10(v10_0) s20(v11_1)
D/dalvikvm( 1248): 0x42855a16 (0042): ldr     r3, [r5, #40]
D/dalvikvm( 1248): 0x42855a18 (0044): str     r0, [r5, #48]
D/dalvikvm( 1248): 0x42855a1a (0046): ldr     r0, [r5, #44]
D/dalvikvm( 1248): 0x42855a1c (0048): adds    r3, r3, #16
D/dalvikvm( 1248): 0x42855a1e (004a): lsls    r0, r0, #3
D/dalvikvm( 1248): 0x42855a20 (004c): str     r1, [r5, #52]
D/dalvikvm( 1248): 0x42855a22 (004e): ldr     r1, [r3, r0]
D/dalvikvm( 1248): 0x42855a24 (0050): adds    r3, r3, #4
D/dalvikvm( 1248): 0x42855a26 (0052): ldr     r2, [r3, r0]
D/dalvikvm( 1248): -------- dalvik offset: 0x002f @ add-double/2addr
D/dalvikvm( 1248): -------- s25(v12_2) s26(v13_2) <- s21(v12_1) s22(v13_1) s23(v14_1) s24(v15_1)
D/dalvikvm( 1248): 0x42855a28 (0054): str     r1, [r5, #56]
D/dalvikvm( 1248): 0x42855a2a (0056): str     r2, [r5, #60]
D/dalvikvm( 1248): 0x42855a2c (0058): vldr    d1, [r5, #48]
D/dalvikvm( 1248): 0x42855a30 (005c): vldr    d2, [r5, #56]
D/dalvikvm( 1248): 0x42855a34 (0060): vadd    d0, d1, d2
D/dalvikvm( 1248): -------- dalvik offset: 0x0030 @ const/4
D/dalvikvm( 1248): -------- s27(v14_2) <-
D/dalvikvm( 1248): 0x42855a38 (0064): movs    r2, #1
D/dalvikvm( 1248): -------- dalvik offset: 0x0031 @ sub-int
D/dalvikvm( 1248): -------- s28(v14_3) <- s20(v11_1) s27(v14_2)
D/dalvikvm( 1248): 0x42855a3a (0066): ldr     r3, [r5, #44]
D/dalvikvm( 1248): 0x42855a3c (0068): subs    r0, r3, r2
D/dalvikvm( 1248): -------- dalvik offset: 0x0033 @ aget-wide
D/dalvikvm( 1248): -------- s29(v14_4) s30(v15_2) <- s8(v8_0) s28(v14_3)
D/dalvikvm( 1248): 0x42855a3e (006a): ldr     r3, [r5, #32]
D/dalvikvm( 1248): 0x42855a40 (006c): adds    r3, r3, #16
D/dalvikvm( 1248): 0x42855a42 (006e): str     r0, [r5, #56]
D/dalvikvm( 1248): 0x42855a44 (0070): lsls    r0, r0, #3
D/dalvikvm( 1248): 0x42855a46 (0072): vstr    d0, [r5, #48]
D/dalvikvm( 1248): 0x42855a4a (0076): ldr     r1, [r3, r0]
D/dalvikvm( 1248): 0x42855a4c (0078): adds    r3, r3, #4
D/dalvikvm( 1248): 0x42855a4e (007a): ldr     r2, [r3, r0]
D/dalvikvm( 1248): -------- dalvik offset: 0x0035 @ add-double/2addr
D/dalvikvm( 1248): -------- s31(v12_3) s32(v13_3) <- s25(v12_2) s26(v13_2) s29(v14_4) s30(v15_2)
D/dalvikvm( 1248): 0x42855a50 (007c): str     r1, [r5, #56]
D/dalvikvm( 1248): 0x42855a52 (007e): str     r2, [r5, #60]
D/dalvikvm( 1248): 0x42855a54 (0080): vldr    d1, [r5, #48]
D/dalvikvm( 1248): 0x42855a58 (0084): vldr    d2, [r5, #56]
D/dalvikvm( 1248): 0x42855a5c (0088): vadd    d0, d1, d2
D/dalvikvm( 1248): -------- dalvik offset: 0x0036 @ add-int/lit8
D/dalvikvm( 1248): -------- s33(v14_5) <- s20(v11_1)
D/dalvikvm( 1248): 0x42855a60 (008c): ldr     r2, [r5, #44]
D/dalvikvm( 1248): 0x42855a62 (008e): adds    r2, r2, #1
D/dalvikvm( 1248): -------- dalvik offset: 0x0038 @ aget-wide
D/dalvikvm( 1248): -------- s34(v14_6) s35(v15_3) <- s8(v8_0) s33(v14_5)
D/dalvikvm( 1248): 0x42855a64 (0090): ldr     r1, [r5, #32]
D/dalvikvm( 1248): 0x42855a66 (0092): adds    r1, r1, #16
D/dalvikvm( 1248): 0x42855a68 (0094): str     r2, [r5, #56]
D/dalvikvm( 1248): 0x42855a6a (0096): lsls    r2, r2, #3
D/dalvikvm( 1248): 0x42855a6c (0098): vstr    d0, [r5, #48]
D/dalvikvm( 1248): 0x42855a70 (009c): ldr     r3, [r1, r2]
D/dalvikvm( 1248): 0x42855a72 (009e): adds    r1, r1, #4
D/dalvikvm( 1248): 0x42855a74 (00a0): ldr     r0, [r1, r2]
D/dalvikvm( 1248): -------- dalvik offset: 0x003a @ add-double/2addr
D/dalvikvm( 1248): -------- s36(v12_4) s37(v13_4) <- s31(v12_3) s32(v13_3) s34(v14_6) s35(v15_3)
D/dalvikvm( 1248): 0x42855a76 (00a2): str     r3, [r5, #56]
D/dalvikvm( 1248): 0x42855a78 (00a4): str     r0, [r5, #60]
D/dalvikvm( 1248): 0x42855a7a (00a6): vldr    d1, [r5, #48]
D/dalvikvm( 1248): 0x42855a7e (00aa): vldr    d2, [r5, #56]
D/dalvikvm( 1248): 0x42855a82 (00ae): vadd    d0, d1, d2
D/dalvikvm( 1248): 0x42855a86 (00b2): vstr    d0, [r5, #48]
D/dalvikvm( 1248): -------- dalvik offset: 0x003b @ mul-double/2addr
D/dalvikvm( 1248): -------- s38(v12_5) s39(v13_5) <- s36(v12_4) s37(v13_4) s4(v4_0) s5(v5_0)
D/dalvikvm( 1248): 0x42855a8a (00b6): vmov.f64 s2, s0
D/dalvikvm( 1248): 0x42855a8e (00ba): vldr    d2, [r5, #16]
D/dalvikvm( 1248): 0x42855a92 (00be): vmuld   d0, d1, d2
D/dalvikvm( 1248): -------- dalvik offset: 0x003c @ aget-wide
D/dalvikvm( 1248): -------- s40(v14_7) s41(v15_4) <- s8(v8_0) s20(v11_1)
D/dalvikvm( 1248): 0x42855a96 (00c2): ldr     r2, [r5, #32]
D/dalvikvm( 1248): 0x42855a98 (00c4): ldr     r3, [r5, #44]
D/dalvikvm( 1248): 0x42855a9a (00c6): adds    r2, r2, #16
D/dalvikvm( 1248): 0x42855a9c (00c8): lsls    r3, r3, #3
D/dalvikvm( 1248): 0x42855a9e (00ca): vstr    d0, [r5, #48]
D/dalvikvm( 1248): 0x42855aa2 (00ce): ldr     r0, [r2, r3]
D/dalvikvm( 1248): 0x42855aa4 (00d0): adds    r2, r2, #4
D/dalvikvm( 1248): 0x42855aa6 (00d2): ldr     r1, [r2, r3]
D/dalvikvm( 1248): 0x42855aa8 (00d4): str     r0, [r5, #56]
D/dalvikvm( 1248): 0x42855aaa (00d6): str     r1, [r5, #60]
D/dalvikvm( 1248): -------- dalvik offset: 0x003e @ mul-double
D/dalvikvm( 1248): -------- s42(v14_8) s43(v15_5) <- s40(v14_7) s41(v15_4) s16(v16_0) s17(v17_0)
D/dalvikvm( 1248): 0x42855aac (00d8): vldr    d1, [r5, #56]
D/dalvikvm( 1248): 0x42855ab0 (00dc): vldr    d2, [r5, #64]
D/dalvikvm( 1248): 0x42855ab4 (00e0): vmuld   d0, d1, d2
D/dalvikvm( 1248): 0x42855ab8 (00e4): vstr    d0, [r5, #56]
D/dalvikvm( 1248): -------- dalvik offset: 0x0040 @ add-double/2addr
D/dalvikvm( 1248): -------- s44(v12_6) s45(v13_6) <- s38(v12_5) s39(v13_5) s42(v14_8) s43(v15_5)
D/dalvikvm( 1248): 0x42855abc (00e8): vldr    d1, [r5, #48]
D/dalvikvm( 1248): 0x42855ac0 (00ec): vldr    d2, [r5, #56]
D/dalvikvm( 1248): 0x42855ac4 (00f0): vadd    d0, d1, d2
D/dalvikvm( 1248): 0x42855ac8 (00f4): vstr    d0, [r5, #48]
D/dalvikvm( 1248): -------- dalvik offset: 0x0041 @ aput-wide
D/dalvikvm( 1248): -------- s44(v12_6) s45(v13_6) s8(v8_0) s20(v11_1)
D/dalvikvm( 1248): 0x42855acc (00f8): ldr     r3, [r5, #32]
D/dalvikvm( 1248): 0x42855ace (00fa): ldr     r0, [r5, #44]
D/dalvikvm( 1248): 0x42855ad0 (00fc): adds    r3, r3, #16
D/dalvikvm( 1248): 0x42855ad2 (00fe): ldr     r1, [r5, #48]
D/dalvikvm( 1248): 0x42855ad4 (0100): ldr     r2, [r5, #52]
D/dalvikvm( 1248): 0x42855ad6 (0102): lsls    r0, r0, #3
D/dalvikvm( 1248): 0x42855ad8 (0104): str     r1, [r3, r0]
D/dalvikvm( 1248): 0x42855ada (0106): adds    r3, r3, #4
D/dalvikvm( 1248): 0x42855adc (0108): str     r2, [r3, r0]
D/dalvikvm( 1248): -------- dalvik offset: 0x0043 @ add-int/lit8
D/dalvikvm( 1248): -------- s46(v11_2) <- s20(v11_1)
D/dalvikvm( 1248): 0x42855ade (010a): ldr     r2, [r5, #44]
D/dalvikvm( 1248): 0x42855ae0 (010c): adds    r2, r2, #1
D/dalvikvm( 1248): 0x42855ae2 (010e): str     r2, [r5, #44]
D/dalvikvm( 1248): -------- dalvik offset: 0x0045 @ goto
D/dalvikvm( 1248): --------
D/dalvikvm( 1248): L0x0029:
D/dalvikvm( 1248): -------- dalvik offset: 0x0029 @ if-ge
D/dalvikvm( 1248): -------- s46(v11_2) s3(v3_0)
D/dalvikvm( 1248): 0x42855ae4 (0110): ldr     r0, [r5, #44]
D/dalvikvm( 1248): 0x42855ae6 (0112): ldr     r1, [r5, #12]
D/dalvikvm( 1248): 0x42855ae8 (0114): cmp     r0, r1
D/dalvikvm( 1248): 0x42855aea (0116): bge     0x42855aee
D/dalvikvm( 1248): 0x42855aec (0118): b       0x42855a08
D/dalvikvm( 1248): -------- exit offset: 0x0046
D/dalvikvm( 1248): 0x42855aee (011a): b       0x42855af8
D/dalvikvm( 1248): -------- reconstruct dalvik PC : 0x42a644d6 @ +0x002b
D/dalvikvm( 1248): 0x42855af0 (011c): ldr     r0, [pc, #32]
D/dalvikvm( 1248): Exception_Handling:
D/dalvikvm( 1248): 0x42855af2 (011e): ldr     r1, [r6, #84]
D/dalvikvm( 1248): 0x42855af4 (0120): blx     r1
D/dalvikvm( 1248): 0x42855af6 (0122): .align4
D/dalvikvm( 1248): -------- chaining cell (normal): 0x0046
D/dalvikvm( 1248): 0x42855af8 (0124): ldr     r0, [r6, #76]
D/dalvikvm( 1248): 0x42855afa (0126): blx     r0
D/dalvikvm( 1248): 0x42855afc (0128): data    0x450c(17676)
D/dalvikvm( 1248): 0x42855afe (012a): data    0x42a6(17062)
D/dalvikvm( 1248): 0x42855b14 (0140): .word (0x42a644d6)
D/dalvikvm( 1248): End Ljnt/scimark2/SOR;execute, 18 Dalvik instructions

merge from open-source master

Merge change 23362

* changes:
  Minor debugging tweaks to IndirectRefTable.

am 2c23efcd: Update prefs to Harmony r772995.

Merge commit '2c23efcdb5bf7e055caa166e56cfdd50011f02df'

* commit '2c23efcdb5bf7e055caa166e56cfdd50011f02df':
  Update prefs to Harmony r772995.

am b8f2972e: Merge change 23193 into eclair

Merge commit 'b8f2972e3ceef7e6bd5ae9763257dfae6fe06349'

* commit 'b8f2972e3ceef7e6bd5ae9763257dfae6fe06349':
  Expand indirect reference ifdefs.

Minor debugging tweaks to IndirectRefTable.

Added serial number checks, fixed tests, updated logging.

Update prefs to Harmony r772995.

Notable changes:
 - exception handling has changed to cleanup more reliably
 - calls to Collection.toArray() size the array properly
 - lots of style tweaks (rewrapping Javadoc, reintending wrapped code, whitespace)
 - new PrefsTester class ensures tests store prefs in the tmp directory

Squashed commit of the following:

    commit 2157269d8ed39ccb8a71d735c12bbabcfd548243
    Merge: d287282 97818bf
    Author: Jesse Wilson <jessewilson@google.com>
    Date:   Wed Aug 5 11:14:26 2009 -0700

        Merge branch 'prefs_772995' into prefs_dalvik

        Conflicts:
         libcore/prefs/.classpath
         libcore/prefs/.settings/org.eclipse.jdt.core.prefs
         libcore/prefs/build.xml
         libcore/prefs/make/exclude.linux.x86_64.drl
         libcore/prefs/make/exclude.windows.x86.drl
         libcore/prefs/make/exclude.windows.x86_64.drl
         libcore/prefs/src/main/java/java/util/prefs/AbstractPreferences.java
         libcore/prefs/src/main/java/java/util/prefs/BackingStoreException.java
         libcore/prefs/src/main/java/java/util/prefs/FilePreferencesFactoryImpl.java
         libcore/prefs/src/main/java/java/util/prefs/FilePreferencesImpl.java
         libcore/prefs/src/main/java/java/util/prefs/InvalidPreferencesFormatException.java
         libcore/prefs/src/main/java/java/util/prefs/NodeChangeEvent.java
         libcore/prefs/src/main/java/java/util/prefs/NodeChangeListener.java
         libcore/prefs/src/main/java/java/util/prefs/PreferenceChangeEvent.java
         libcore/prefs/src/main/java/java/util/prefs/PreferenceChangeListener.java
         libcore/prefs/src/main/java/java/util/prefs/Preferences.java
         libcore/prefs/src/main/java/java/util/prefs/PreferencesFactory.java
         libcore/prefs/src/main/java/java/util/prefs/RegistryPreferencesFactoryImpl.java
         libcore/prefs/src/main/java/java/util/prefs/RegistryPreferencesImpl.java
         libcore/prefs/src/main/java/java/util/prefs/XMLParser.java
         libcore/prefs/src/main/java/org/apache/harmony/prefs/internal/nls/Messages.java
         libcore/prefs/src/main/native/prefs/windows/PreferencesImpl.c
         libcore/prefs/src/main/native/prefs/windows/hyprefs.rc
         libcore/prefs/src/main/native/prefs/windows/makefile
         libcore/prefs/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/AbstractPreferencesTest.java
         libcore/prefs/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/AllTests.java
         libcore/prefs/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/FilePreferencesImplTest.java
         libcore/prefs/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/MockAbstractPreferences.java
         libcore/prefs/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/MockPreferencesFactory.java
         libcore/prefs/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/MockSecurityManager.java
         libcore/prefs/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/NodeChangeListenerTest.java
         libcore/prefs/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/PreferenceChangeListenerTest.java
         libcore/prefs/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/PreferencesFactoryTest.java
         libcore/prefs/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/PreferencesTest.java
         libcore/prefs/src/test/java/tests/prefs/AllTests.java

    commit d287282b550d4a5d262f1d1703344ed61bdc6d15
    Author: Jesse Wilson <jessewilson@google.com>
    Date:   Tue Aug 4 14:36:36 2009 -0700

        Dalvik Prefs

    commit 97818bf21cfde744eeb5fbf1f9c31d9bd66f5a2e
    Author: Jesse Wilson <jessewilson@google.com>
    Date:   Tue Aug 4 14:35:52 2009 -0700

        Prefs 772995

    commit 9a506f93947938dad3b41e1393f53b766ba0319f
    Author: Jesse Wilson <jessewilson@google.com>
    Date:   Tue Aug 4 14:22:40 2009 -0700

        Prefs 527399

Merge change 23193 into eclair

* changes:
  Expand indirect reference ifdefs.

Expand indirect reference ifdefs.

This excludes some things that used to be common between the direct and
indirect reference implementations.  The goal is to restore the original
method call performance.  In particular, we no longer convert native
method arguments to local references when USE_INDIRECT_REF is not
defined.

am 3f7a2590: Merge change 22992 into eclair

Merge commit '3f7a259014f94b6515f4a5668431656498705d59'

* commit '3f7a259014f94b6515f4a5668431656498705d59':
  Annotate tests that are failing due to legacy IP address formats that have not been implemented yet.

Merge change 22992 into eclair

* changes:
  Annotate tests that are failing due to legacy IP address formats that have not been implemented yet.

am af0e8388: Fix reporting of certain verify errors.

Merge commit 'af0e838887d3a2fa76e0d2716e39adf2bb0c01a1'

* commit 'af0e838887d3a2fa76e0d2716e39adf2bb0c01a1':
  Fix reporting of certain verify errors.

Merge change 22527

* changes:
  More work on getting Dalvik to build on the host (particularly OSX).

Fix reporting of certain verify errors.

The code was assuming that the reference type could always be inferred
from the error code, but in two cases it couldn't.  This resulted in a
weird string appearing where the class name should be in the exception.
The type is now explicitly stuffed into the replacement instruction.

I added one additional test to 075; with this, plus 003 and 077, I think
we have full coverage.

For bug 2084560.

Merge change 23113

* changes:
  Improved codegen for inline, continuing codegen restructuring

Improved codegen for inline, continuing codegen restructuring

Added support for Thumb2 IT.  Moved compare-long and floating point
comparisons inline.  Temporarily disabled use of Thumb2 CBZ & CBNZ
because they were causing too many out-of-range assembly restarts.
Bug fix for LIR3 assert.

Merge change 9368

* changes:
  libcore/.../rg_apache_harmony_xml_ExpatParser: in C++, the return type of strchr(const char*) is 'const char*' instead of 'char *'.

Don't mutate input in OSMemory.setIntArray/setShortArray.

We now take a copy and then swap bytes in the copy if necessary,
rather than swapping the input, copying, and swapping the input
back.

I've switched to GetShortArrayRegion/GetIntArrayRegion instead
of GetPrimitiveArrayCritical because the latter makes life
unnecessarily hard for the VM/GC, and requires a second JNI call
to undo.

I've also renamed the native functions to match the Java methods
they implement.

(Tested by running the nio tests on the emulator, with added
logging to check that all four variants are called.)

Bug: 2019584

Annotate tests that are failing due to legacy IP address formats that have not been implemented yet.

Change-Id: Ifdf236450007866f24c8b23d52617c41d4e9c324

am 9495a944: Merge change 22965 into eclair

Merge commit '9495a9449e2f429517bac0d35722b2e9f101f5a9'

* commit '9495a9449e2f429517bac0d35722b2e9f101f5a9':
  Fix some JNI indirect reference stuff.

Merge change 22965 into eclair

* changes:
  Fix some JNI indirect reference stuff.

am a055db83: Update x-net to Harmony r802921.

Merge commit 'a055db83f05034fcd5564ab5930e8d16d4ececfb'

* commit 'a055db83f05034fcd5564ab5930e8d16d4ececfb':
  Update x-net to Harmony r802921.

Update x-net to Harmony r802921.

Notable changes
 - synchronization added where it was needed!
 - try/finally added to reliably tear down in DefaultSSLContext
 - ContextImpl deleted, it wasn't necessary
 - methods reordered to make statics first in the class
 - PrivilegedActions parameterized with <Void>
 - DigitalSignature now throws AssertionErrors in impossible states
   and throws AlertExceptions on invalid keys (rather than dumping
   a stacktrace)
 - ValueKeys added to SSLSessionImpl instead of TwoKeyMaps
 - SSLSessionImpl.clone() simplified to do a traditional clone

Squashed commit of the following:

commit 2d9e43d542ab7086af271bf52e847c582decbab1
Merge: 8b79eb4 a8dc377
Author: Jesse Wilson <jessewilson@google.com>
Date:   Tue Aug 25 15:25:21 2009 -0700

    Merge branch 'x-net_802921' into x-net_dalvik

    Conflicts:
     libcore/x-net/.classpath
     libcore/x-net/.settings/org.eclipse.jdt.core.prefs
     libcore/x-net/build.xml
     libcore/x-net/src/main/java/javax/net/DefaultServerSocketFactory.java
     libcore/x-net/src/main/java/javax/net/DefaultSocketFactory.java
     libcore/x-net/src/main/java/javax/net/ServerSocketFactory.java
     libcore/x-net/src/main/java/javax/net/SocketFactory.java
     libcore/x-net/src/main/java/javax/net/ssl/CertPathTrustManagerParameters.java
     libcore/x-net/src/main/java/javax/net/ssl/DefaultHostnameVerifier.java
     libcore/x-net/src/main/java/javax/net/ssl/DefaultSSLContext.java
     libcore/x-net/src/main/java/javax/net/ssl/DefaultSSLSocketFactory.java
     libcore/x-net/src/main/java/javax/net/ssl/HandshakeCompletedEvent.java
     libcore/x-net/src/main/java/javax/net/ssl/HandshakeCompletedListener.java
     libcore/x-net/src/main/java/javax/net/ssl/HostnameVerifier.java
     libcore/x-net/src/main/java/javax/net/ssl/HttpsURLConnection.java
     libcore/x-net/src/main/java/javax/net/ssl/KeyManager.java
     libcore/x-net/src/main/java/javax/net/ssl/KeyManagerFactory.java
     libcore/x-net/src/main/java/javax/net/ssl/KeyManagerFactorySpi.java
     libcore/x-net/src/main/java/javax/net/ssl/KeyStoreBuilderParameters.java
     libcore/x-net/src/main/java/javax/net/ssl/ManagerFactoryParameters.java
     libcore/x-net/src/main/java/javax/net/ssl/SSLContext.java
     libcore/x-net/src/main/java/javax/net/ssl/SSLContextSpi.java
     libcore/x-net/src/main/java/javax/net/ssl/SSLEngine.java
     libcore/x-net/src/main/java/javax/net/ssl/SSLEngineResult.java
     libcore/x-net/src/main/java/javax/net/ssl/SSLException.java
     libcore/x-net/src/main/java/javax/net/ssl/SSLHandshakeException.java
     libcore/x-net/src/main/java/javax/net/ssl/SSLKeyException.java
     libcore/x-net/src/main/java/javax/net/ssl/SSLPeerUnverifiedException.java
     libcore/x-net/src/main/java/javax/net/ssl/SSLPermission.java
     libcore/x-net/src/main/java/javax/net/ssl/SSLProtocolException.java
     libcore/x-net/src/main/java/javax/net/ssl/SSLServerSocket.java
     libcore/x-net/src/main/java/javax/net/ssl/SSLServerSocketFactory.java
     libcore/x-net/src/main/java/javax/net/ssl/SSLSession.java
     libcore/x-net/src/main/java/javax/net/ssl/SSLSessionBindingEvent.java
     libcore/x-net/src/main/java/javax/net/ssl/SSLSessionBindingListener.java
     libcore/x-net/src/main/java/javax/net/ssl/SSLSessionContext.java
     libcore/x-net/src/main/java/javax/net/ssl/SSLSocket.java
     libcore/x-net/src/main/java/javax/net/ssl/SSLSocketFactory.java
     libcore/x-net/src/main/java/javax/net/ssl/TrustManager.java
     libcore/x-net/src/main/java/javax/net/ssl/TrustManagerFactory.java
     libcore/x-net/src/main/java/javax/net/ssl/TrustManagerFactorySpi.java
     libcore/x-net/src/main/java/javax/net/ssl/X509ExtendedKeyManager.java
     libcore/x-net/src/main/java/javax/net/ssl/X509KeyManager.java
     libcore/x-net/src/main/java/javax/net/ssl/X509TrustManager.java
     libcore/x-net/src/main/java/javax/net/ssl/package-info.java
     libcore/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/ClientHandshakeImpl.java
     libcore/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/HandshakeProtocol.java
     libcore/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/JSSEProvider.java
     libcore/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/KeyManagerImpl.java
     libcore/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/OpenSSLSocketImplWrapper.java
     libcore/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLContextImpl.java
     libcore/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLServerSocketFactoryImpl.java
     libcore/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLServerSocketImpl.java
     libcore/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLSessionContextImpl.java
     libcore/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLSessionImpl.java
     libcore/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLSocketFactoryImpl.java
     libcore/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLSocketImpl.java
     libcore/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLSocketInputStream.java
     libcore/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLSocketOutputStream.java
     libcore/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/CertPathTrustManagerParametersTest.java
     libcore/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/HandshakeCompletedEventTest.java
     libcore/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/HttpsURLConnectionTest.java
     libcore/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/KeyStoreBuilderParametersTest.java
     libcore/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/SSLContext1Test.java
     libcore/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/SSLEngineTest.java
     libcore/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/SSLPermissionTest.java
     libcore/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/SSLServerSocketTest.java
     libcore/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/SSLSocketTest.java
     libcore/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/TrustManagerFactory1Test.java
     libcore/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/serialization/HandshakeCompletedEventTest.java
     libcore/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/serialization/SSLExceptionTest.java
     libcore/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/serialization/SSLHandshakeExceptionTest.java
     libcore/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/serialization/SSLKeyExceptionTest.java
     libcore/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/serialization/SSLPeerUnverifiedExceptionTest.java
     libcore/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/serialization/SSLProtocolExceptionTest.java
     libcore/x-net/src/test/api/java/org/apache/harmony/xnet/tests/javax/net/ssl/serialization/SSLSessionBindingEventTest.java
     libcore/x-net/src/test/impl/java.injected/javax/net/ServerSocketFactoryTest.java
     libcore/x-net/src/test/impl/java.injected/javax/net/SocketFactoryTest.java
     libcore/x-net/src/test/impl/java.injected/javax/net/ssl/DefaultSSLServerSocketFactoryTest.java
     libcore/x-net/src/test/impl/java.injected/javax/net/ssl/DefaultSSLSocketFactoryTest.java
     libcore/x-net/src/test/impl/java.injected/javax/net/ssl/HttpsURLConnection_ImplTest.java
     libcore/x-net/src/test/impl/java.injected/javax/net/ssl/SSLServerSocketFactoryTest.java
     libcore/x-net/src/test/impl/java.injected/javax/net/ssl/SSLSocketFactoryTest.java
     libcore/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/CipherSuiteTest.java
     libcore/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/DigitalSignatureTest.java
     libcore/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/HandshakeProtocolTest.java
     libcore/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/KeyManagerImplTest.java
     libcore/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/SSLEngineImplTest.java
     libcore/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/SSLServerSocketImplTest.java
     libcore/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/SSLSessionContextImplTest.java
     libcore/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/SSLSessionImplTest.java
     libcore/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/SSLSocketFactoriesTest.java
     libcore/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/SSLSocketFunctionalTest.java
     libcore/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/SSLSocketImplTest.java
     libcore/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/SSLStreamedInputTest.java
     libcore/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/ServerHandshakeImplTest.java
     libcore/x-net/src/test/impl/java.injected/org/apache/harmony/xnet/provider/jsse/TrustManagerImplTest.java
     libcore/x-net/src/test/impl/java/org/apache/harmony/xnet/tests/provider/jsse/DigitalSignatureTest.java
     libcore/x-net/src/test/impl/java/org/apache/harmony/xnet/tests/provider/jsse/KeyManagerFactoryImplTest.java
     libcore/x-net/src/test/impl/java/org/apache/harmony/xnet/tests/provider/jsse/ProtocolVersionTest.java
     libcore/x-net/src/test/impl/java/org/apache/harmony/xnet/tests/provider/jsse/TrustManagerFactoryImplTest.java
     libcore/x-net/src/test/java/javax/net/ssl/KeyManagerFactorySpiTests.java
     libcore/x-net/src/test/java/javax/net/ssl/MyKeyManagerFactorySpi.java
     libcore/x-net/src/test/java/javax/net/ssl/MySSLContextSpi.java
     libcore/x-net/src/test/java/javax/net/ssl/MyTrustManagerFactorySpi.java
     libcore/x-net/src/test/java/javax/net/ssl/SSLContextSpiTests.java
     libcore/x-net/src/test/java/javax/net/ssl/TrustManagerFactorySpiTests.java
     libcore/x-net/src/test/java/tests/api/javax/net/ssl/KeyManagerFactory1Test.java
     libcore/x-net/src/test/java/tests/api/javax/net/ssl/KeyManagerFactory2Test.java
     libcore/x-net/src/test/java/tests/api/javax/net/ssl/SSLContext2Test.java
     libcore/x-net/src/test/java/tests/api/javax/net/ssl/SSLSessionBindingEventTest.java
     libcore/x-net/src/test/java/tests/api/javax/net/ssl/TrustManagerFactory2Test.java
     libcore/x-net/src/test/support/common/java/org/apache/harmony/xnet/tests/support/MyKeyManagerFactorySpi.java
     libcore/x-net/src/test/support/common/java/org/apache/harmony/xnet/tests/support/MySSLContextSpi.java
     libcore/x-net/src/test/support/common/java/org/apache/harmony/xnet/tests/support/MyTrustManagerFactorySpi.java

commit 8b79eb40a27f0b336d5516606d43162ecead09ca
Author: Jesse Wilson <jessewilson@google.com>
Date:   Tue Aug 25 12:58:17 2009 -0700

    x-net_dalvik

commit a8dc3778cd2a1a5d6d0cfff6eec22e7bfbdb9c14
Author: Jesse Wilson <jessewilson@google.com>
Date:   Tue Aug 25 12:56:55 2009 -0700

    x-net_802921

commit 07ca0ed8aa5927c909f880559c17d162c111608e
Author: Jesse Wilson <jessewilson@google.com>
Date:   Tue Aug 25 12:56:07 2009 -0700

    x-net_527399

commit 9b44ccfc38c2fc2a6cf2c3cc39a13cc5bce635ba
Author: Jesse Wilson <jessewilson@google.com>
Date:   Tue Aug 25 11:14:01 2009 -0700

    Small changes missed in the original submission of 22482.

Fix some JNI indirect reference stuff.

Convert where needed, don't convert where not needed, and make sure
we're using the right one.

With this, my ad-hoc tests pass, and the boot proceeds until we hit a
failure that looks like it might be due to logic outside the VM.

Merge change 10635

* changes:
  Add a bit-map encoding of Object-reference field offsets to ClassObject.