Skip to content

Commit

Permalink
Merge branch 'wasm' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
copy committed Jan 3, 2021
2 parents e3a2ad9 + 8107f26 commit 497f618
Show file tree
Hide file tree
Showing 376 changed files with 105,104 additions and 23,947 deletions.
2 changes: 2 additions & 0 deletions .cargo/config
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[build]
target-dir = "build"
14 changes: 12 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,17 +1,27 @@
*.swp
*.swo
deploy.sh
screenshots/
tests/qemu/test-i386
tests/jit-paging/test-jit
*.map
build/
closure-compiler/
images/
*.bak
*.orig
*.wasm
*.o
*.bin
*.img
*.fixture
*.fuse_hidden*
*.DS_Store
node_modules/
Cargo.lock
build-head
src/rust/gen/interpreter.rs
src/rust/gen/interpreter0f.rs
src/rust/gen/analyzer.rs
src/rust/gen/analyzer0f.rs
src/rust/gen/jit.rs
src/rust/gen/jit0f.rs
bios/seabios
25 changes: 25 additions & 0 deletions .jshint.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{
"esversion": 8,
"globalstrict": true,
"sub": true,
"expr": true,
"-W058": true,
"-W080": true,
"-W082": true,
"-W079": true,
"-W117": true,
"-W054": true,
"-W027": true,
"-W040": true,
"-W087": true,
"-W008": true,
"loopfunc": true,
"shadow": true,
"funcscope": true,
"globals": {
"Blob": false,
"alert": false,
"console": false
},
"browser": true
}
9 changes: 9 additions & 0 deletions .rustfmt.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
use_field_init_shorthand = true
match_block_trailing_comma = true
fn_single_line = true
imports_indent = "Block"
control_brace_style = "ClosingNextLine"
single_line_if_else_max_width = 92
ignore = [
"src/rust/gen"
]
6 changes: 0 additions & 6 deletions .travis-run-integration-acpi.sh

This file was deleted.

6 changes: 0 additions & 6 deletions .travis-run-integration.sh

This file was deleted.

3 changes: 0 additions & 3 deletions .travis-run-nasm.sh

This file was deleted.

5 changes: 0 additions & 5 deletions .travis-run-unit-qemu.sh

This file was deleted.

5 changes: 0 additions & 5 deletions .travis-run-unit.sh

This file was deleted.

20 changes: 0 additions & 20 deletions .travis.yml

This file was deleted.

27 changes: 27 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
[package]
name = "v86"
version = "0.1.0"
publish = false

[dev-dependencies]
quickcheck = "0.6.2"

[features]
default = []
profiler = []

[lib]
crate-type = ["cdylib"]
path = "src/rust/lib.rs"

[profile.dev]
lto = false
opt-level = 2
panic = "abort"
overflow-checks = false

[profile.release]
lto = true
opt-level = 3
incremental = false
panic = "abort"
12 changes: 4 additions & 8 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
Copyright (c) 2012-2018, Fabian Hemmer
Copyright (c) 2012, The v86 contributors
All rights reserved.

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
modification, are permitted provided that the following conditions are met:

1. Redistributions of source code must retain the above copyright notice, this
list of conditions and the following disclaimer.
list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.
and/or other materials provided with the distribution.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
Expand All @@ -20,7 +20,3 @@ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

The views and conclusions contained in the software and documentation are those
of the authors and should not be interpreted as representing official policies,
either expressed or implied, of the FreeBSD Project.
Loading

0 comments on commit 497f618

Please sign in to comment.