aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix typosTor Norbye2012-07-231-2/+2
| | | | | | Change-Id: Ib40b9c88cf8a9a7e37e3f40249b78fa01cd41ab4 http://code.google.com/p/android/issues/detail?id=35283 http://code.google.com/p/android/issues/detail?id=35284
* Merge "Use a per-process server address for the GLES server"Jesse Hall2012-07-123-26/+16
|\
| * Use a per-process server address for the GLES serverJesse Hall2012-07-113-26/+16
|/ | | | | | | | | | | | | | | Previously we used a hardcoded address (tcp port, unix pipe path, etc.) for the OpenGLRender system. Multiple emulators would all try to listen on the same address, with the system non-deterministically (?) choosing which one accepted each new connection. This resulted in frames going to the wrong emulator window, one emulator shutting down another's OpenGL system, etc. Now the OpenGLRender server requests an unused tcp port or derives a path from the pid, and reports the address back to the emulator client to use for future connections from the guest. Change-Id: I139d32615200b36b87f2d2ede4abb4060ec02776
* Merge "[MIPS] Fix startup segfault in emulator64-mips"Andrew Hsieh2012-06-212-6/+4
|\
| * [MIPS] Fix startup segfault in emulator64-mipsDuane Sand2012-06-212-6/+4
|/ | | | | | | | | Avoid truncation of 64-bit host addresses for 32-bit Mips physaddrs. Revert workaround I17fe688d19e3cd7f328721e6363bacd6e6689ca; allow emulator to again default to emulator64-mips. Change-Id: I0c83d8bf60fc52a758b84d8131b2bad53375aa61 Signed-off-by: Duane Sand <duanes@mips.com>
* Merge "Force emulator to quit if it's built w/o global register variable ↵Andrew Hsieh2012-06-115-11/+28
|\ | | | | | | support"
| * Force emulator to quit if it's built w/o global register variable supportAndrew Hsieh2012-06-125-11/+28
|/ | | | | | | | | | | | | | | | | | | Clang and llvm-gcc don't support global register variable (GRV) crucial to emulator (where a register is reserved to point to target architecture state for better code-gen). Clang and llvm-gcc are provided in recent Xcode to replace the original gcc with GRV support. MacOSX developers may accidentally install newer Xcode and break emulator. This CL allows emulator (and the rest of Android tree) to build but forces emulator to quit if it's built w/o GRV support. Developers build Android tree with clang or llvm-gcc can still get good system image, but they have to use emulators built the other way or from SDKs to run it. Related CL & bug entry: https://android-review.googlesource.com/#/c/33011 http://code.google.com/p/android/issues/detail?id=32577 Change-Id: Ia585dd7bf9783e2ff4c114b4f0ec20b89684ab57
* Merge "[MIPS] TLBRET_DIRTY is a valid return value from get_physical_address"Andrew Hsieh2012-06-081-1/+1
|\
| * [MIPS] TLBRET_DIRTY is a valid return value from get_physical_addressBhanu Chetlapalli2012-06-081-1/+1
|/ | | | | Change-Id: I3ddfd3de165575c52a76cf9acee1e304d42562cf Signed-off-by: Chris Dearman <chris@mips.com>
* Merge "[MIPS] Clear softfpu status before emulating FPU instructions"Andrew Hsieh2012-06-081-0/+16
|\
| * [MIPS] Clear softfpu status before emulating FPU instructionsBhanu Chetlapalli2012-06-081-0/+16
|/ | | | | | | This applies to round, trunc, ceil and floor instructions Change-Id: I4a5f1619ecd8fe2d7ce508f8e569be129a8b1e34 Signed-off-by: Chris Dearman <chris@mips.com>
* Merge "[MIPS] Add Goldfish target support"Andrew Hsieh2012-06-0812-22/+445
|\
| * [MIPS] Add Goldfish target supportBhanu Chetlapalli2012-06-0712-22/+445
|/ | | | | | | | | | | | | | | | | | | | | | Basic Goldfish support for MIPS. Also, Fix host CPU consumption when guest is idle When the CPU is in wait state, do not wake-up if an interrupt can't be taken. This avoid host CPU running at 100% if a device (e.g. timer) has an interrupt line left enabled. Also factorize code to check if interrupts are enabled in cpu_mips_hw_interrupts_pending(). CPU consumption based on a patch from Edgar E. Iglesias <edgar.iglesias@gmail.com> Change-Id: Ie8371c8d0c9af1e0c8ba4cac419979350de0f5d9 Signed-off-by: yajin <yajin@mips.com.cm> Signed-off-by: Douglas Leung <douglas@mips.com> Signed-off-by: Bhanu Chetlapalli <bhanu@mips.com> Signed-off-by: Chris Dearman <chris@mips.com>
* Merge "Mark gles pipe connected after callback invoked"Andrew Hsieh2012-06-061-2/+16
|\
| * Mark gles pipe connected after callback invokedJiang, Yunhong2012-06-011-2/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently the net pipe is mark connected right after initialization through asyncConnector_run invokation. However, asyncConnector_run is intended only invoked when callback through select. In some extrem situation, this will cause the qemu pipe driver begin send buffer before the connection is setup. Change this to be asyncConnector_run usage correct, and sendBuffer will check the connection status. Change-Id: Ib10e72e56e1ed5017fc3654b0fce8cacf484c8f8 Signed-off-by: Jiang, Yunhong <yunhong.jiang@intel.com>
* | Merge "[MIPS] Copy vmlinux to kernel-qemu"Andrew Hsieh2012-06-051-2/+2
|\ \
| * | [MIPS] Copy vmlinux to kernel-qemuBhanu Chetlapalli2012-06-051-2/+2
| | | | | | | | | | | | | | | | | | | | | MIPS Qemu kernel build does not generate a compressed z/bzImage. Change-Id: I74bb4a85c034f0b72fa2e81f13f79c140c01eabe Signed-Off-By: Bhanu Chetlapalli <bhanu@mips.com>
* | | Merge "Track started and initialized states separately"Jesse Hall2012-06-051-4/+21
|\ \ \ | |/ / |/| |
| * | Track started and initialized states separatelyJesse Hall2012-06-051-4/+21
|/ / | | | | | | | | | | | | | | | | | | | | Several OpenGL ES renderer functions are called blindly by the emulator and are supposed to do nothing if the renderer isn't running. They were checking whether the libraries were loaded instead of whether the renderer was started. This causes problems when the renderer is started and then stopped (for stats collection) since the libraries aren't unloaded. Change-Id: Ia6c0d2e5b618ff982b55caf35c38bda9aad30ee1
* | Merge "fix BUILD_DEBUG_EMULATOR build"Andrew Hsieh2012-05-313-3/+8
|\ \
| * | fix BUILD_DEBUG_EMULATOR buildIliyan Malchev2012-06-013-3/+8
|/ / | | | | | | | | Change-Id: Ib888b8114d77270383c6ac563fb36bfdaf7b72fc Signed-off-by: Iliyan Malchev <malchev@google.com>
* | Merge "replace _exit() with exit()"Andrew Hsieh2012-05-314-7/+7
|\ \ | |/ |/|
| * replace _exit() with exit()Iliyan Malchev2012-06-014-7/+7
|/ | | | | | | | | | When the emulator is compiled with -pg, it generates a stats file (gmon.out) upon exiting, as long as the exit it done when main() returns normally or exit() is called. Calling _exit() or exiting via an unhandled signal will not cause gmon.out to be generated. Change-Id: I0d5ea5a0b0314f97d2fdc0c92fd6f38c65377eb9 Signed-off-by: Iliyan Malchev <malchev@google.com>
* Merge "Fixed prebuilt path and toolchain names"Andrew Hsieh2012-05-302-25/+21
|\
| * Fixed prebuilt path and toolchain namesAndrew Hsieh2012-05-302-25/+21
|/ | | | | | | | | | | 1) Use "prebuilts" instead of "prebuilt" to legalize BUILD_TOP 2) Update CROSSTOOLCHAIN and CROSSPREFIX for all arch 3) Add -fno-pic because some toolchain (eg. x86 and mips) in prebuilts/gcc are NDK-compatible (ie. enforces -fpic, etc) Verified to build working kernel-goldfish for all arch Change-Id: I93ac8f0beeaae14aa4575629fd8eaf4af73ef7ce
* Merge "[MIPS] Add MIPS support to build-kernel.sh"Andrew Hsieh2012-05-292-3/+23
|\
| * [MIPS] Add MIPS support to build-kernel.shBhanu Chetlapalli2012-05-212-3/+23
| | | | | | | | | | | | Enables building of mips goldfish kernel Signed-Off-By: Bhanu Chetlapalli <bhanu@mips.com>
* | Merge "Replace i686-android-linux with i686-linux-android"Jean-Baptiste Queru2012-05-242-3/+3
|\ \ | |/ |/|
| * Replace i686-android-linux with i686-linux-androidH.J. Lu2012-05-032-3/+3
| | | | | | | | Author: "H.J. Lu" <hongjiu.lu@intel.com>
* | Merge "Use -qemu -lcd-density parameter for setting qemu.sf.lcd_density boot ↵Vladimir Chtchetkine2012-05-211-0/+9
|\ \ | | | | | | | | | property."
| * | Use -qemu -lcd-density parameter for setting qemu.sf.lcd_density boot property.Vladimir Chtchetkine2012-05-181-0/+9
| | | | | | | | | | | | Change-Id: Ibfd85c3e351caef89ae57630c824255f29f47914
| | |
| \ \
*-. \ \ Reconcile with jb-release nakasi-factoryrom-releaseThe Android Open Source Project2012-05-160-0/+0
|\ \ \ \ | |/ / / | | | | | | | | Change-Id: I498e07ca8d4fc3181054e386148b3b3ac41d59c9
| * | | merge in jb-release history after reset to jb-devThe Android Automerger2012-04-250-0/+0
| |\ \ \
| | * \ \ merge in jb-release history after reset to masterThe Android Automerger2012-04-230-0/+0
| | |\ \ \
| | | * \ \ merge in jb-release history after reset to masterThe Android Automerger2012-04-160-0/+0
| | | |\ \ \
| | | | * \ \ merge in jb-release history after reset to masterThe Android Automerger2012-04-100-0/+0
| | | | |\ \ \
| | | | | * \ \ merge in jb-release history after reset to masterThe Android Automerger2012-04-090-0/+0
| | | | | |\ \ \
| | | | | | * \ \ merge in jb-release history after reset to masterThe Android Automerger2012-04-050-0/+0
| | | | | | |\ \ \
| | | | | | | * \ \ merge in jb-release history after reset to masterThe Android Automerger2012-04-040-0/+0
| | | | | | | |\ \ \
| | | | | | | | * \ \ merge in jb-release history after reset to masterThe Android Automerger2012-04-020-0/+0
| | | | | | | | |\ \ \
| | | | | | | | | * \ \ merge in jb-release history after reset to masterThe Android Automerger2012-03-290-0/+0
| | | | | | | | | |\ \ \
| | | | | | | | | | * \ \ merge in jb-release history after reset to masterThe Android Automerger2012-03-280-0/+0
| | | | | | | | | | |\ \ \
| | | | | | | | | | | * \ \ merge in jb-release history after reset to masterThe Android Automerger2012-03-260-0/+0
| | | | | | | | | | | |\ \ \
| | | | | | | | | | | | * \ \ merge in jb-release history after reset to masterThe Android Automerger2012-03-210-0/+0
| | | | | | | | | | | | |\ \ \
| | | | | | | | | | | | | * \ \ merge in jb-release history after reset to masterThe Android Automerger2012-03-200-0/+0
| | | | | | | | | | | | | |\ \ \
| | | | | | | | | | | | | | * \ \ merge in jb-release history after reset to masterThe Android Automerger2012-03-200-0/+0
| | | | | | | | | | | | | | |\ \ \ | | | | | | | | | | | | | | |/ / / | | | | | | | | | | | | | |/| | |
| | | | | | | | | | | | | * | | | merge in jb-release history after reset to masterThe Android Automerger2012-03-190-0/+0
| | | | | | | | | | | | | |\ \ \ \
| | | | | | | | | | | | | | * \ \ \ merge in jb-release history after reset to masterThe Android Automerger2012-03-150-0/+0
| | | | | | | | | | | | | | |\ \ \ \
| | | | | | | | | | | | | | | * \ \ \ merge in jb-release history after reset to masterThe Android Automerger2012-03-120-0/+0
| | | | | | | | | | | | | | | |\ \ \ \
| | | | | | | | | | | | | | | | * \ \ \ merge in jb-release history after reset to masterThe Android Automerger2012-03-060-0/+0
| | | | | | | | | | | | | | | | |\ \ \ \