summaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorAndy McFadden <fadden@android.com>2011-02-14 14:44:35 -0800
committerAndy McFadden <fadden@android.com>2011-02-14 14:44:35 -0800
commit1a8493cafbdbdcc26f5fbe7ed2cf8bdd01d1b732 (patch)
tree4b2d7026bb368fc81c8957923d853db18a7ac9ec /docs
parentded0427bd7fa2eeb85920184e922eca72475c50d (diff)
parent6e2af6d21076023f141a482d49b607407b2bc2c1 (diff)
downloadandroid_dalvik-1a8493cafbdbdcc26f5fbe7ed2cf8bdd01d1b732.tar.gz
android_dalvik-1a8493cafbdbdcc26f5fbe7ed2cf8bdd01d1b732.tar.bz2
android_dalvik-1a8493cafbdbdcc26f5fbe7ed2cf8bdd01d1b732.zip
resolved conflicts for merge of 6e2af6d2 to dalvik-dev
Change-Id: Ib5ec0912c0c5d7041b794351fcca10c41c4294ec
Diffstat (limited to 'docs')
-rw-r--r--docs/porting-guide.html7
1 files changed, 5 insertions, 2 deletions
diff --git a/docs/porting-guide.html b/docs/porting-guide.html
index 9b02d176d..d1a1ea38d 100644
--- a/docs/porting-guide.html
+++ b/docs/porting-guide.html
@@ -164,6 +164,9 @@ source files.
<li>Make sure <code>dalvik/vm/Android.mk</code> will find the files for
your architecture. If <code>$(TARGET_ARCH)</code> is configured this
will happen automatically.
+<li>Disable the Dalvik JIT. You can do this in the general device
+configuration, or by editing the initialization of WITH_JIT in
+<code>dalvik/vm/Dvm.mk</code> to always be <code>false</code>.
</ol>
</p><p>
You now have the basic framework in place. Whenever you make a change, you
@@ -177,7 +180,7 @@ of the files in <code>dalvik/vm/mterp/out</code> by executing
in assembly.
<li>In the <code>dalvik</code> directory, regenerate the
<code>libdvm.so</code> library with <code>mm</code>. You can also use
-<code>make libdvm</code> from the top of the tree.
+<code>mmm dalvik/vm</code> from the top of the tree.
</ol>
</p><p>
This will leave you with an updated libdvm.so, which can be pushed out to
@@ -241,7 +244,7 @@ for examples.
<h3>Replacing Stubs</h3>
<p>
-There are roughly 230 Dalvik opcodes, including some that are inserted by
+There are roughly 250 Dalvik opcodes, including some that are inserted by
<a href="dexopt.html">dexopt</a> and aren't described in the
<a href="dalvik-bytecode.html">Dalvik bytecode</a> documentation. Each
one must perform the appropriate actions, fetch the next opcode, and