summaryrefslogtreecommitdiffstats
path: root/vm
Commit message (Collapse)AuthorAgeFilesLines
* Clean up some dead dalvik cruft.Elliott Hughes2014-11-153-391/+0
| | | | | | | | I don't know whether dmtracedump is still useful, so I'm assuming we should keep it building. But at least now it's more obvious that it's the only user of Profile.h. Change-Id: Ieabce07cb278a19af72b566b08193db17d95e66d
* Dalvik is dead, long live Dalvik!Brian Carlstrom2014-08-051742-328972/+0
| | | | | | | | | | | | | | | | | | | | | | | croot cd dalvik repo start dalvik-is-dead-long-live-dalvik . repo sync -c . git rm -r README.txt git rm -r dexopt git rm -r tools/deadcode.py git rm -r tools/dex-preopt git rm -r tools/dexcheck git rm -r tools/gdbjithelper git rm -r unit-tests git rm -r vm git checkout HEAD vm/Common.h (needed by libdex) git checkout HEAD vm/DalvikVersion.h (needed by libdex) git checkout HEAD vm/Profile.h (needed by dmtracedump) git add Android.mk (after removing vm, dexopt, and unit-tests references) git commit -a -m 'Dalvik is dead, long live Dalvik!' Bug: 14298175 Change-Id: I9dd13053677629d13496d4238af4374452cda415
* Rename openDexFileNative to openDexFile.Calin Juravle2014-07-161-4/+4
| | | | | | | We no longer need two distinct methods. Bug: 15563230 Change-Id: Ifd1437b9a8bd0f35a5d2228d2534f69d64d139cc
* Switch defaults of dlmalloc/jemalloc.Christopher Ferris2014-07-121-3/+3
| | | | Change-Id: Ic24de231aea0f4ea49ea51572a839639dc7fb79b
* Really move dalvik off bionic's __memcmp16.Elliott Hughes2014-06-121-42/+11
| | | | | | | The inline assembler calls back to C for "long" strings, so we still need the stub. Change-Id: I894ea1aef1f60738a30c19aac728ed101d228111
* Merge "Move target dalvik off __memcmp16."Elliott Hughes2014-06-101-49/+0
|\
| * Move target dalvik off __memcmp16.Elliott Hughes2014-06-101-49/+0
| | | | | | | | | | | | | | | | The host was already using the other code path, and this lets us move __memcmp16 out of bionic and into art where it belongs without having to duplicate the work for dalvik too. Change-Id: I99e21ecd35e67b9711bb28d14d2f31c451b7ecb7
* | Merge "Build host libdvm as 32-bit only."Ying Wang2014-06-101-2/+3
|\ \ | |/ |/|
| * Build host libdvm as 32-bit only.Ying Wang2014-05-201-2/+3
| | | | | | | | | | Bug: 13751317 Change-Id: I97add3cfb9ad84df4da97096d41059091608f216
* | Fix dalvik script to invoke dalvikvm with the right library.Nicolas Geoffray2014-06-031-0/+1
| | | | | | | | Change-Id: I1271488d5c3ac334270bbb27d94a221dd997682b
* | Merge "Support new VMRuntime native method"Sebastien Hertz2014-05-221-0/+7
|\ \
| * | Support new VMRuntime native methodSebastien Hertz2014-05-221-0/+7
| |/ | | | | | | | | | | | | | | Implements isCheckJniEnabled method. Bug: 14888999 Bug: 14888124 Change-Id: I8a2d3f22f84a093be2fbc74464af6aa7b2a2bebb
* / Add support for jemalloc.Christopher Ferris2014-05-143-1/+11
|/ | | | | | | | This is good enough to get dalvik to compile, but it still requires more work to make it really work. Bug: 981363 Change-Id: I411428a2e859c1f474fa0d7aaf406979bba9ed72
* Remove tests of dead code.Elliott Hughes2014-05-132-378/+0
| | | | | Bug: 14903517 Change-Id: I9fc7dd742e80850eeb461f91be7750530585cfb3
* Track package manager changes for arch specific dexopt.Narayan Kamath2014-05-011-2/+2
| | | | | | | | | | | | | | - Changes signature of isDexOptNeededInternal. No behavioural changes are needed because dalvik only uses the first argument to the function (the "name") and dexopt is architecture agnostic. - Changes dexOptGenerateCacheFileName to place dex files under /data/dalvik-cache/<instruction-set>. This allows us to avoid needing dalvik specific logic in the package manager and installd. (cherry picked from commit f752d041dac2cc8e26d03292ffec986a2bf905f9) Change-Id: Ie31c9925269d6ac97d358ce49219557692704329
* Remove inconsistent usage of macros that broke Thread.sleep/wait on hostPaul Duffin2014-04-245-26/+29
| | | | | | | | | | | | | | | | | Code for managing Thread.sleep/wait used both !defined(__APPLE__) and HAVE_POSIX_CLOCKS interchangeably to mean the same thing. That worked when one or other was set but failed on host because neither were set and could also fail if they were both set. This changed to use HAVE_POSIX_CLOCKS consistently. The code that used this was spread across 4 separate files with quite a lot of duplication so that has been replaced with a new method dvmInitCondForTimedWait in Sync.cpp. A few extra comments were added to make some things that were a bit confusing clearer, hopefully. Change-Id: I7660c931f0cafcd0563afd1165de2aa615040602 Bug: https://code.google.com/p/android/issues/detail?id=68402
* Merge "Dalvik script: Use PWD for android-data and cleanup after running."Nicolas Geoffray2014-04-161-4/+7
|\
| * Dalvik script: Use PWD for android-data and cleanup after running.Nicolas Geoffray2014-04-021-4/+7
| | | | | | | | Change-Id: I0c8940c77184a40c4c20c7c369f1a8a36624ccb6
* | Fix debugging on dalvik.Narayan Kamath2014-04-101-3/+1
| | | | | | | | | | | | | | | | | | | | u4* args is a pointer to a flat array of 4 byte values, so the "debugFlags" arg of postForkChild(long, int debugFlags) is at args[2], not args[1]. bug: 13926783 Change-Id: Icd3bbf9dd249cdd70e085acdd4dd7daa415cd698
* | Move zygote initialization code to the framework.Narayan Kamath2014-04-015-771/+168
| | | | | | | | | | | | | | | | The framework class com.android.internal.os.ZygoteInit will call back to the runtime before / after the fork, so that it can perform runtime specific bringup / teardown. Change-Id: I9730e12da8b22f03397658b1bddc7fd73f4fbc7d
* | Remove Zygote.forkNarayan Kamath2014-03-281-35/+0
| | | | | | | | | | | | | | Currently unused. Note that ART does not have a native definition of this function. Change-Id: If75830ca231db7a597dfe726fb0968828fca9593
* | dalvik: fix mips buildColin Cross2014-03-241-1/+1
| | | | | | | | | | | | | | Fix typo in rule for libdvm_sv. LOCAL_MODULE_UNSUPPORTED_ARCH should be LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH. Change-Id: Iada67cc93560938d2a82a320cb88b7560e7db1b4
* | dalvik: let 32-bit dalvik build on multilib targetsColin Cross2014-03-213-25/+26
|/ | | | | | | | | | | Set LOCAL_32_BIT_ONLY for all target modules Use LOCAL_LDFLAGS_x86 instead of ifeq ($(TARGET_ARCH),x86) Set dvm_arch to TARGET_2ND_ARCH instead of TARGET_ARCH on 64-bit targets This will allow "make checkbuild" to succeed on 64-bit platforms. Change-Id: Idd51dda26b54855c0c8640f8fcfbf4274baf8845
* Merge "Script is using function(), which is bash specific."Nicolas Geoffray2014-03-181-1/+1
|\
| * Script is using function(), which is bash specific.Nicolas Geoffray2014-03-171-1/+1
| | | | | | | | Change-Id: I925d42d10e471fa25ca3e924b1db1db6911b5641
* | Changed dvmDexCacheStatus to check for odex file first.Jeff Hao2014-03-171-49/+53
|/ | | | | | | | | This prevents the generation of a new dexfile when an odex file already exists when switching between Art and Dalvik. (cherry picked from commit 36e356c96640775f0a3f167bd2426ea0f0093b8b) Change-Id: Ieafdca8453f70c96edb787b5a3a3ac7c7aeea021
* Add native binding for isDexOptNeededInternal.Narayan Kamath2014-03-101-0/+7
| | | | | | | | | Dalvik has no profiler, so we can safely ignore the "defer" argument. Keeps dalvik functional on master. Change-Id: I2ace9a215e7ff471294927aa870e55cf7c0327b1
* Remove usage of pthread_cond_timedwait_monotonic_np.Narayan Kamath2014-03-044-11/+24
| | | | | | | | | Replaced with the posix compliant pthread_condattr_setclock. Unfortunately, mac OS doesn't support CLOCK_MONOTONIC or (pthread_condattr_setclock) so we fall back to using the "default" pthread_condattr_t value like we did earlier. Change-Id: I23475ef0d4e392d9e14402c6b5f8f658c5ed4063
* Remove old fork-and-specialize APIDave Platt2014-02-131-18/+1
| | | | | | | | | As promised, this is the cleanup patch-set which removes the old native "fork and specialize" API, which has been replaced by a slightly-enhanced one which can close the Zygote socket descriptors in the Zygote child. Change-Id: I33f504afd242e268863270139b4e421d4b0728f2
* Merge "Finish fixing Zygote descriptor leakage problem"Dave Platt2014-02-121-3/+76
|\
| * Finish fixing Zygote descriptor leakage problemDave Platt2014-02-061-3/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to prevent Zygote descriptors from leaking into the child environment, they should be closed by the forked-off child process before the child switches to the application UID. These changes close the descriptors via dup2(), substituting a descriptor open to /dev/null in their place; this allows the Zygote Java code to close the FileDescriptor objects cleanly. This is a multi-project change: dalvik, art, libcore, frameworks/base, and external/sepolicy are affected. The CLs need to be approved together, lest the build break or the software fail to boot. Round 2: whitespace Bug: 12114500 Change-Id: I989c83291d0c42d4cad63f24a3e98a93e231c9d3
* | Move dalvik off cacheflush so we can deprecate it.Elliott Hughes2014-02-128-30/+17
| | | | | | | | | | Bug: 12965705 Change-Id: I805428e3103ff578d048ecbbc6ae30c0ead19ef9
* | Merge "Fix dalvik script file to be able to run without defining environment ↵Nicolas Geoffray2014-02-111-0/+13
|\ \ | | | | | | | | | variables."
| * | Fix dalvik script file to be able to run without defining environment variables.Nicolas Geoffray2014-02-111-0/+13
| |/ | | | | | | Change-Id: I344437997de020225225b1e884fb2b79b525f98b
* | Merge "Use MAP_FIXED in remapNewHeap"Elliott Hughes2014-02-081-1/+1
|\ \ | |/ |/|
| * Use MAP_FIXED in remapNewHeapPete Delaney2014-01-091-1/+1
| | | | | | | | | | | | | | | | The heap address must not change when it is remapped Change-Id: Ia44f178932e2afe8de3d4739e7085caae8568885 Signed-off-by: Pete Delaney <piet.delaney@imgtec.com> Signed-off-by: Chris Dearman <chris.dearman@imgtec.com>
* | Switch dalvik over to a long in DexFile.Elliott Hughes2014-02-041-12/+10
| | | | | | | | Change-Id: I75798b22a64ee3f5aa8429bb22ac25e5b9966247
* | Merge "dalvik: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH"Colin Cross2014-01-281-1/+1
|\ \
| * | dalvik: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATHColin Cross2014-01-271-1/+1
| | | | | | | | | | | | | | | | | | | | | LOCAL_MODULE_PATH doesn't work for multiarch builds, replace it with LOCAL_MODULE_RELATIVE_PATH. Change-Id: I4e4ceec61d026bbe74ba604554c06104bde42e5e
* | | Merge "Update Dalvik native interfaces for startMethodTracing."Jeff Hao2014-01-281-6/+12
|\ \ \ | |/ / |/| |
| * | Update Dalvik native interfaces for startMethodTracing.Jeff Hao2014-01-271-6/+12
| | | | | | | | | | | | | | | Bug: 12766325 Change-Id: I1a3e041df339172f8acdbf582112f010e32be835
* | | Merge "Revert "Protect JIT Code cache modifications with version check""Jeff Hao2014-01-271-32/+18
|\ \ \ | |/ / |/| |
| * | Revert "Protect JIT Code cache modifications with version check"Jeff Hao2014-01-271-32/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change was causing timeouts that led to native crashes. I'm reverting this change until we figure out why this extra locking caused that. Bug:12554497 This reverts commit 522811d183e5cc7d5ac3e1bce1baa16e0d9a7170. Change-Id: Ia3a43f698703e8ddc54ca501103a07e276851723
* | | Let dalvik use <stdint.h> for SIZE_MAX.Elliott Hughes2014-01-243-3/+1
| | | | | | | | | | | | | | | Bug: 12708004 Change-Id: I96a167e1161d6350dfb97aff1c59d1ec39db9628
* | | Change exception message for ArrayStoreException.Narayan Kamath2014-01-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The exception message is tested in SystemTest. I'm not sure what's worse: Changing the dalvik message or changing the test to be happy with both messages. (I assume the art message is the one we chose because it's more recent.) Change-Id: Ia68641a05f992ab5a949add865fb3f7bb46e61be
* | | Force stack alignment for external calls for x86vladimir.a.ivanov2014-01-131-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Force stack alignment to 16 bytes for external calls. Bug: http://code.google.com/p/android/issues/detail?id=61012 Change-Id: I9d34a6d02e879a36657db43838e5438bd0cd7213 Signed-off-by: vladimir.a.ivanov <vladimir.a.ivanov@intel.com> Signed-off-by: Serguei Katkov <serguei.i.katkov@intel.com> Signed-off-by: Razvan A Lupusoru <razvan.a.lupusoru@intel.com>
* | | Merge "Protect JIT Code cache modifications with version check"Bill Buzbee2014-01-101-18/+32
|\| | | |/ |/|
| * Protect JIT Code cache modifications with version checkArdi Dhrimaj2013-12-101-18/+32
| | | | | | | | | | | | Required since the JIT CC is asyncronously reset from threads running GC. Change-Id: Ibc26d33c00c3beab13043838ffe28474d0458bd3
* | Merge "Initialize callTgt variable"Ian Rogers2013-12-311-1/+1
|\ \
| * | Initialize callTgt variableBernhard Rosenkränzer2013-12-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This silcences a clang build failure: dalvik/vm/compiler/codegen/arm/armv7-a-neon/../CodegenDriver.cpp:904:41: error: variable 'callTgt' is uninitialized when used here [-Werror,-Wuninitialized] LOAD_FUNC_ADDR(cUnit, r2, (int) callTgt); ^~~~~~~ Change-Id: Ic5b3bb492f19b842743bf7d6214c89301ff524e7 Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>