Commit Graph

658 Commits

Author SHA1 Message Date
Joshua Warner
3bd00f19bc fix remote-test functionality for windows 2014-02-22 15:35:12 -07:00
Joshua Warner
730dade53e break out signal handling from System 2014-02-21 23:36:40 -07:00
Joshua Warner
5ffdfecdc2 remove vm from code paths, to match namespacing 2014-02-21 13:32:28 -07:00
Ilya Mizus
66f25193df OsConstants removed from blacklist 2014-02-21 23:14:07 +03:00
Ilya Mizus
ff4c07f05b Changes to build on my libcore version 2014-02-21 03:50:06 +03:00
Joel Dice
2b1177039e use armv7 memory barriers by default
armv7 and later provide weaker cache coherency models than armv6 and
earlier, so we cannot just implement memory barriers as no-ops.  This
patch uses the DMB instruction (or the equivalent OS-provided barrier
function) to implement barriers.  This should fix concurrency issues
on newer chips such as the Apple A6 and A7.

If you still need to support ARMv6 devices, you should pass
"armv6=true" to make when building Avian.  Ideally, the VM would
detect what kind of CPU it was executing on at runtime and direct the
JIT compiler accordingly, but I don't know how to do that on ARM.
Patches are welcome, though!
2014-01-10 17:32:54 -07:00
Joel Dice
65f6431de0 use ';' instead of ':' as path separator on windows when running tests 2014-01-08 16:08:15 -07:00
Joel Dice
be549ecae3 Merge pull request #142 from joshuawarner32/compiler-boilerplate
Remove boilerplate in Compiler interface
2013-12-20 13:33:30 -08:00
Joshua Warner
fa65c67fbf Extract independent runtime thunks into their own file 2013-12-18 22:46:58 -07:00
Joel Dice
8bd1c8de0e only enable LTO if use-lto is true
When using clang, as with GCC, we shouldn't use LTO if the developer
has specified use-lto=false.
2013-12-18 15:26:43 -07:00
Joel Dice
38477c113c fix iOS 7 build using latest Xcode
It looks like the iOS 7 SDK doesn't have GCC anymore, so we need to
use clang instead.  Also, thread_act.h and thread_status.h have moved,
so I updated arm.h accordingly.  That might break the build for older
SDKs, but I don't have one available at the moment.  If it does break,
I'll fix it.
2013-12-18 11:10:04 -07:00
Joshua Warner
d2c3d771d7 fix java 1.6 compatibility, and make sure it's maintained in the future 2013-12-10 20:26:29 -07:00
Joshua Warner
94f5888f97 prevent openjdk-src build from trying to load the installed 'JavaRuntimeSupport' (fixes #128) 2013-12-07 18:49:23 -07:00
Joshua Warner
773417ab2b fix openjdk-src build failures on osx 10.9 2013-12-07 16:43:18 -07:00
Joshua Warner
0a4eff33b2 fix jdk-test failures 2013-12-06 19:30:04 -07:00
Joshua Warner
47a7732a81 add jdk-test target, and fix failures
The intent of this target is to run our test suite against the installed jre.
This should help prevent our VM from diverging in implementation from the jdk.

The remainder of this commit fixes the problems that this exposes.
2013-12-06 15:00:02 -07:00
Mike Jensen
a2e1e1eec9 Merge pull request #102 from dscho/proxy-annotations
This looks good to me, good work.
2013-12-02 09:13:01 -08:00
Johannes Schindelin
1960081d1a Compile the annotation tests with the annotations in the class path
Earlier, if the annotations were already up-to-date (but
Annotations.class not), the compilation would fail.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2013-11-26 15:27:07 -06:00
Ben Limmer
39214d860f Automatically generate and commit Javadoc.
This will only generate on pushes to master, and not pull requests.
2013-11-20 17:02:33 -07:00
Joshua Warner
80d49dada7 Merge pull request #101 from getlantern/lantern
Fixed problem picking up policy jars in OpenJDK embedded build
2013-11-11 08:34:46 -08:00
Ox To A Cart
cfe041c7ac Fixed problem picking up policy jars in OpenJDK embedded build 2013-11-08 09:11:46 -06:00
Joshua Warner
a54be0a381 fix openjdk build (add InnerClassReference to classpath-sources) 2013-11-07 18:52:11 -07:00
Joshua Warner
790fcff73e Merge pull request #89 from dscho/get-resources
Support ClassLoader#getResources with multiple class path elements
2013-11-04 16:29:40 -08:00
Joshua Warner
9080b462b6 fix jni_md.h not found 10.9 problem 2013-11-04 17:26:57 -07:00
Johannes Schindelin
a2feec0bab Add a pseudo-integration test for getResources()
This adds an extra class path element to the VM running the unit tests,
writes files with identical file names into both directories and then
verifies that SystemClassLoader#getResources can find them.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2013-11-04 16:53:02 -06:00
Geoff Nixon
69ea1f5721 Bugfixes for Mac OS X, etc. 2013-10-31 01:35:56 -07:00
Joshua Warner
699ca75c54 fix sdk detection logic 2013-09-03 21:03:29 -06:00
Joel Dice
c06dd28ea0 fix Android classpath build for iOS
This mainly involved reworking the makefile to avoid conflating
Darwin/ARM builds with iOS, since we may also want to build for the
iOS Simulator, which is i386.

Note that I was only able to test this on the Simulator, since I don't
have a real iOS device to test with.  Sorry if I broke something; if
so, please fix it :)
2013-07-31 15:20:32 -07:00
Joel Dice
3058e4254d only use librt on Linux; OS X doesn't have or need it 2013-07-07 11:35:20 -06:00
Joel Dice
82577d742f fix Android classpath build
Hopefully it will stay fixed this time, since we now specify commit
hashes for each dependency which are known to work.
2013-07-05 14:36:16 -06:00
Joel Dice
c5d2cb007c tweaks to prepare for 0.7 release 2013-07-02 14:39:20 -06:00
Joshua Warner
de21913d13 fix linux->darwin cross-compile
There were two issues: the linux->darwin cross compiler is more stringent
about unused variables, and the makefile specified flags for building ON
darwin that were actually applicable whenever we are building FOR darwin.
2013-06-04 13:32:22 -06:00
Joel Dice
64002319c5 use Android directory layout when accessing class library code
Per https://github.com/ReadyTalk/avian/issues/53, Avian should build
against a standard AOSP checkout, which means we should look for
subprojects in the directories the repo utility would place them.
2013-04-22 17:10:23 -06:00
Carsten Elton Sorensen
43f41f6e73 Fixed embed.exe loader 2013-04-03 11:46:17 +02:00
Joel Dice
e8a1900c2b fix openjdk-src build regression 2013-03-26 08:30:26 -06:00
Joel Dice
1630739849 fix Windows x86_64 build regression due to unspecified AVIAN_TARGET_FORMAT 2013-03-15 17:47:15 -06:00
Joel Dice
651145bd61 remove -static-libstdc++ -static-libgcc from bootimage-generator-lflags
MinGW-w64's GCC doesn't understand those flags, and we shouldn't be
linking statically or dynamically with either of those libraries.
2013-03-15 13:57:44 -06:00
Joel Dice
9f2e0f6c4f rebuild bootimage-generator when vm-objects have changed 2013-03-15 13:16:20 -06:00
Joel Dice
8ac1f68a79 fix Android library build regression for non-Windows platforms 2013-03-15 13:15:48 -06:00
Joel Dice
d5504d8f58 first step towards supporting Android class library on Windows
A majority of the tests are passing, but more work is needed to get
them all to pass.
2013-03-14 15:33:05 -06:00
Joel Dice
ff19ab6c13 add avian.trace.port property
Setting this property (e.g. -Davian.trace.port=5555) will cause the VM
to start an extra daemon thread which listens on the specified TCP
port for incoming connections and dumps stack traces for all running
threads to that socket.  You can retrieve that dump using e.g. netcat:

  nc localhost 5555
2013-03-08 14:47:27 -07:00
Joel Dice
caa632d601 fix build when let expressions aren't available 2013-03-04 14:42:18 -07:00
Joel Dice
5d730fe8fa various tweaks to get hello-ios working with the Android library 2013-03-04 14:24:41 -07:00
Joel Dice
b3978c0a0a fix msvc build 2013-03-04 11:09:59 -07:00
Joshua Warner
06bc978d33 Merge branch 'wip' 2013-03-01 15:44:02 -07:00
Joshua Warner
df23c379bf fix windows embed-loader build 2013-03-01 14:52:27 -07:00
Joel Dice
625c04e786 a few tweaks to fix the OS X Android class library build
With corresponding changes to libcore, all the tests are passing
except Datagrams, which fails with a NPE in
NetworkInterface.getNetworkInterfacesList due to OS X not having
/sys/class/net.  Porting that class to OS X looks like a non-trivial
task.
2013-02-28 10:15:10 -07:00
Joshua Warner
9327043bc5 Merge branch 'master' into wip
Conflicts:
	makefile
	src/codegen/arm/assembler.cpp
	src/codegen/powerpc/assembler.cpp
	src/codegen/x86/assembler.cpp
2013-02-27 19:27:07 -07:00
Joel Dice
c261e1c283 fix OpenJDK tests on OS X 2013-02-27 12:05:57 -07:00
Joel Dice
726cdb645b support iOS SDK 6.1 2013-02-27 12:05:57 -07:00
Joel Dice
22ecf27aa5 use -I$(src) instead of -idirafter $(src)
This fixes the iOS build, where the wrong version of util.h was being
used.  The change to use -idirafter happened way back in 2007, and I
can't remember what its intention was.  We'll have to watch for
regressions on other platforms.
2013-02-27 12:05:57 -07:00
Joel Dice
3eda6ab0a2 Merge remote-tracking branch 'github/master' into dicej
Conflicts:
	makefile
2013-02-27 10:09:38 -07:00
Joel Dice
d4a42c7a26 add Android class library instructions to README.md 2013-02-27 10:03:17 -07:00
Joel Dice
e6a46fc014 various fixes to get avian-swt-examples working with the Android class library 2013-02-26 16:24:02 -07:00
Joel Dice
8a976fafa7 fix avian-unittest openjdk-src build 2013-02-25 16:55:44 -07:00
Joel Dice
0bb0b1ec0e enable use of Android class library on 64-bit systems
This involved patching libcore.git to make it 64-bit safe.
2013-02-25 16:41:46 -07:00
Joshua Warner
56625b89d8 group x86, arm, and powerpc target directories into 'target' 2013-02-23 22:47:52 -07:00
Joel Dice
686c2352c1 all tests now pass for Android class library build 2013-02-22 17:23:59 -07:00
Joel Dice
0a4a04cc09 Merge remote-tracking branch 'github/master' into dicej 2013-02-22 17:13:10 -07:00
Joshua Warner
dbbd4e7d40 attempt fix for openjdk tests 2013-02-22 15:13:25 -07:00
Joel Dice
9060a31348 Merge remote-tracking branch 'github/master' into dicej
Conflicts:
	src/classpath-openjdk.cpp
2013-02-22 14:43:20 -07:00
Joshua Warner
494f773bc9 remove redundency in vm-depends 2013-02-21 19:42:29 -07:00
Joshua Warner
fe7bb5e640 Merge branch 'master' into wip
Conflicts:
	makefile
2013-02-21 19:33:38 -07:00
Joshua Warner
af0e7767eb Merge branch 'master' of github.com:ReadyTalk/avian
Conflicts:
	makefile
2013-02-21 16:23:22 -07:00
Joshua Warner
ab9f9550cf move tokenizer.h to include/avian/util/string.h, merge in the String declaration from object-writer/tools.h 2013-02-21 16:18:20 -07:00
Joel Dice
42d39b1af1 more Android class library work 2013-02-21 15:37:17 -07:00
Joshua Warner
32044637cd move bootimage generator to src/tools 2013-02-21 13:15:58 -07:00
Joshua Warner
186a3993b5 move system implementations to src/vm/system/ 2013-02-21 13:11:29 -07:00
Joshua Warner
48691bb50a move stream.h to include, and type-generator to src/tools 2013-02-20 21:26:34 -07:00
Joel Dice
fd047bd6e9 find headers regardless of directory layout in vm-depends definition 2013-02-20 17:20:10 -07:00
Joshua Warner
1f0833252d Merge branch 'master' into wip
Conflicts:
	src/codegen/compiler/event.cpp
	src/codegen/x86/assembler.cpp
	src/common.h
2013-02-20 11:27:39 -07:00
Joel Dice
d414fd4c7b more progress on Android class library port
Hello.java works.  Yay.
2013-02-20 10:22:40 -07:00
Joshua Warner
77365dfcc1 move binary-to-object to new tree structure 2013-02-19 20:23:11 -07:00
Joel Dice
f45b95e1b5 progress towards Android classpath support
It now builds and links, but fails at runtime because
register_libcore_icu_ICU can't find the file it wants.  We'll probably need to replace register_libcore_icu_ICU with a better-behaved version.
2013-02-19 16:48:33 -07:00
Joel Dice
0f524fcf16 first pass at Android classpath support
Stuff compiles, but linking breaks spectacularly.  Next step is to
figure out how to build the dependencies without checking out and
building the entire Android platform.
2013-02-19 09:36:19 -07:00
Joshua Warner
46029939d3 begin work on audit-codegen 2013-02-19 09:06:25 -07:00
Joshua Warner
24c0fab9bf add unit tests for arg parser 2013-02-19 09:06:25 -07:00
Joshua Warner
e9be3c4e07 move arg parser out of bootimage.cpp 2013-02-19 09:06:21 -07:00
Joshua Warner
61f03643e0 begin splitting up x86 assembler 2013-02-19 09:05:31 -07:00
Joshua Warner
5a5b9248e6 fix unittests for process=interpret build 2013-02-15 20:44:55 -07:00
Joshua Warner
9a91c1dd2d set remote-test variable based on the presence of remote-test-host or remote-test-port
The new way to run a remote test is:

make arch=<arch> remote-test-host=<host_to_test_on> test
2013-02-15 17:43:21 -07:00
Joshua Warner
a3fb540ec3 add ArchitecturePlanTest 2013-02-15 07:35:17 -07:00
Joshua Warner
33d245d0f7 add unittest framework 2013-02-14 20:54:20 -07:00
Joshua Warner
1258b23ea1 add remote-test capability
To execute tests on a remote host (for instance, because you're cross-compiling),
simply do:

make remote-test=true remote-test-host=<host_to_test_on> test

You can set several variables to control the functionality of remote-test.
See them below, along with their default values:

remote-test-host = localhost # host to ssh to
remote-test-port = 22
remote-test-user = ${USER} # user to execute tests as
remote-test-dir = /tmp/avian-test-${USER} # dir to rsync build output to
2013-02-14 18:47:48 -07:00
Joshua Warner
2db0303e2f further compiler cleanup / organization 2013-02-13 23:23:07 -07:00
Joel Dice
a7ab59f1f6 switch clean target back to deleting all generated files 2013-02-13 22:13:56 -07:00
Joshua Warner
d00950458f move JumpEvent out of compiler.cpp 2013-02-13 22:13:56 -07:00
Joshua Warner
0f6e098b69 move CallEvent out of compiler.cpp 2013-02-13 22:13:55 -07:00
Joshua Warner
6d265374ec move Reads out of compile.cpp 2013-02-13 22:13:55 -07:00
Joshua Warner
b0abc4e1e5 further split up compiler.cpp 2013-02-13 22:13:55 -07:00
Joshua Warner
952cad2360 move site out of compiler.cpp 2013-02-13 22:13:55 -07:00
Joshua Warner
740886d58e begin splitting up compiler.cpp 2013-02-13 22:13:55 -07:00
Joshua Warner
ef5e534e1e begin moving register allocator out of compiler.cpp 2013-02-13 22:13:55 -07:00
Joshua Warner
3589d5c205 Merge branch 'master' of git://github.com/ReadyTalk/avian
Conflicts:
	src/codegen/arm/assembler.cpp
	src/common.h
	src/machine.cpp
2013-02-12 17:37:19 -07:00
Joshua Warner
f7b49ddb06 allow codegen targets (Architectures and Assemblers) to co-exist
The primary motivation behind this is to allow all the different Assemblers
to be built at once, on a single machine. This should dramatically reduce
the time required to make sure that a particular change doesn't break
the build for one of the not-so-common architectures (arm, powerpc)

Simply pass "codegen-targets=all" to make to compile all
src/codegen/<arch>/assembler.cpp.

Note that while these architectures are built, they will not be fully-
functional.  Certain stuff is assumed to be the same across the entire
build (such as TargetBytesPerWord), but this isn't the case anymore.
2013-02-12 17:16:40 -07:00
Joel Dice
86c92e26cb Merge commit '752d02e7786b807185e3f4cd254ee988c01f830f' into HEAD
Conflicts:
	classpath/java-io.cpp
	makefile
	src/bootimage.cpp
	src/interpret.cpp
	src/machine.cpp
	src/windows.cpp
2013-02-12 10:47:28 -07:00
Joel Dice
937343d0d3 don't specify -Wl,-rpath argument on Darwin or Windows (take 2) 2013-02-12 09:27:47 -07:00
Joel Dice
8a7b6488d4 Merge remote branch 'osmandapp/upstream' 2013-02-12 09:26:01 -07:00
Joel Dice
752d02e778 make bootimage-object depend on openjdk-jar-dep
This ensures that the OpenJDK classes have been extracted prior to
bootimage creation.
2013-02-12 09:23:43 -07:00
Joel Dice
d1a7b66085 don't specify -Wl,-rpath argument on Darwin or Windows
It remains to be seen what form that argument should take on those
operating systems; for now, it only causes trouble, so we'll just
leave it out.
2013-02-12 08:22:21 -07:00