Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge pull request #188 from magcius/cleanups

Cleanups
  • Loading branch information...
commit 110589dc52a6a864552818b31040866df9ca1ddf 2 parents 5d9849c + d27beca
@mbebenita mbebenita authored
Showing with 0 additions and 78 deletions.
  1. +0 −38 src/avm2/runtime.js
  2. +0 −40 src/avm2/utils/README.md
View
38 src/avm2/runtime.js
@@ -536,44 +536,6 @@ function resolveMultinameInTraits(obj, mn) {
/**
* Resolving a multiname on an object using linear search.
*/
-/*
-function resolveMultiname(obj, mn) {
- release || assert(!Multiname.isQName(mn), mn, " already resolved");
-
- obj = Object(obj);
-
- var publicQn;
-
- // Check if the object that we are resolving the multiname on is a JavaScript native prototype
- // and if so only look for public (dynamic) properties. The reason for this is because we cannot
- // overwrite the native prototypes to fit into our trait/dynamic prototype scheme, so we need to
- // work around it here during name resolution.
-
- var isNative = isNativePrototype(obj);
- if (isNative) {
- for (var i = 0, j = mn.namespaces.length; i < j; i++) {
- if (mn.namespaces[i].isDynamic()) {
- var publicQn = mn.getQName(i);
- if (Multiname.getQualifiedName(publicQn) in obj) {
- return publicQn;
- }
- break;
- }
- }
- return undefined;
- }
-
- for (var i = 0, j = mn.namespaces.length; i < j; i++) {
- var qn = mn.getQName(i);
- if (Multiname.getQualifiedName(qn) in obj) {
- return qn;
- }
- }
-
- return undefined;
-}
-*/
-
function resolveMultiname(obj, mn, traitsOnly) {
assert(!Multiname.isQName(mn), mn, " already resolved");
View
40 src/avm2/utils/README.md
@@ -1,40 +0,0 @@
-Useful third-party tools
-========================
-
-The utils/ dir should contain third-party tools from Adobe to help
-with the development process. In here, you should have:
-
- * A debugger build of avmshell
-
-When debugging an AVM2 problem in Shumway, it's useful to have the real
-AVM2 around. Surprisingly, the official AVM2 used in Adobe is actually
-open-source: it was donated to Mozilla as [tamarin](http://hg.mozilla.org/tamarin-redux).
-The actual project has issues building with recent versions of gcc, so
-I prefer to grab a build from Adobe themselves. They can be found in the
-[Mozilla FTP](ftp://ftp.mozilla.org/pub/js/tamarin/builds/tamarin-redux/7336-70c2f9c0ea92/).
-
- * A version of the ActionScript compiler, ASC
-
-Open-sourced as part of the Flex SDK, recently donated to Apache, it can
-be found in [Mozilla's FTP as well](ftp://ftp.mozilla.org/pub/js/tamarin/builds/asc/latest/).
-
- * A recent standalone build of SpiderMonkey
-
-I have no idea where to get that one.
-
-tl;dr
------
-
- $ cd avm2/
- $ curl ftp://ftp.mozilla.org/pub/js/tamarin/builds/tamarin-redux/7336-70c2f9c0ea92/linux/avmshell_d_64 > utils/avmshell
- $ curl ftp://ftp.mozilla.org/pub/js/tamarin/builds/asc/latest/asc.jar > utils/asc.jar
-
-
- $ cd bin/
-
- $ export ASC=../utils/asc.jar
- $ export BUILTINABC=../generated/builtin/builtin.abc
- $ python shu.py asc ../tests/sunspider/crypt-aes.as
-
- $ ../utils/js ../bin/avm.js ../tests/sunspider/crypto-aes.abc
- $ ../utils/avmshell_d_64 -Dverbose=interp -Dinterp ../tests/sunspider/crypto-aes.abc
Please sign in to comment.
Something went wrong with that request. Please try again.