mirror of
https://github.com/fluencelabs/asmble
synced 2025-07-01 23:41:35 +00:00
Compare commits
3 Commits
lateinit_f
...
documentat
Author | SHA1 | Date | |
---|---|---|---|
3b1c314c35 | |||
f1a2d14463 | |||
ab269fdbd8 |
28
build.gradle
28
build.gradle
@ -21,7 +21,7 @@ buildscript {
|
||||
allprojects {
|
||||
apply plugin: 'java'
|
||||
group 'com.github.cretz.asmble'
|
||||
version '0.4.0-fl-fix'
|
||||
version '0.4.0-fl'
|
||||
|
||||
repositories {
|
||||
mavenCentral()
|
||||
@ -143,17 +143,17 @@ project(':examples') {
|
||||
}
|
||||
|
||||
|
||||
//project(':examples:go-simple') {
|
||||
// apply plugin: 'application'
|
||||
// ext.wasmCompiledClassName = 'asmble.generated.GoSimple'
|
||||
// dependencies {
|
||||
// compile files('build/wasm-classes')
|
||||
// }
|
||||
// compileJava {
|
||||
// dependsOn compileGoWasm
|
||||
// }
|
||||
// mainClassName = 'asmble.examples.gosimple.Main'
|
||||
//}
|
||||
project(':examples:go-simple') {
|
||||
apply plugin: 'application'
|
||||
ext.wasmCompiledClassName = 'asmble.generated.GoSimple'
|
||||
dependencies {
|
||||
compile files('build/wasm-classes')
|
||||
}
|
||||
compileJava {
|
||||
dependsOn compileGoWasm
|
||||
}
|
||||
mainClassName = 'asmble.examples.gosimple.Main'
|
||||
}
|
||||
|
||||
// todo temporary disable Rust regex, because some strings in wasm code exceed the size in 65353 bytes.
|
||||
|
||||
@ -231,6 +231,10 @@ def publishSettings(project, projectName, projectDescription) {
|
||||
|
||||
bintray {
|
||||
|
||||
if(!hasProperty("bintrayUser") || !hasProperty("bintrayKey")) {
|
||||
return
|
||||
}
|
||||
|
||||
user = bintrayUser
|
||||
key = bintrayKey
|
||||
publications = ['MyPublication']
|
||||
|
@ -184,7 +184,7 @@ sealed class Node {
|
||||
interface Const<out T : Number> : Args { val value: T }
|
||||
}
|
||||
|
||||
// Control instructions [https://www.w3.org/TR/2018/WD-wasm-core-1-20180215/#control-instructions]
|
||||
// Control instructions [https://www.w3.org/TR/wasm-core-1/#control-instructions]
|
||||
|
||||
object Unreachable : Instr(), Args.None
|
||||
object Nop : Instr(), Args.None
|
||||
@ -209,12 +209,12 @@ sealed class Node {
|
||||
override val reserved: Boolean
|
||||
) : Instr(), Args.ReservedIndex
|
||||
|
||||
// Parametric instructions [https://www.w3.org/TR/2018/WD-wasm-core-1-20180215/#parametric-instructions]
|
||||
// Parametric instructions [https://www.w3.org/TR/wasm-core-1/#parametric-instructions]
|
||||
|
||||
object Drop : Instr(), Args.None
|
||||
object Select : Instr(), Args.None
|
||||
|
||||
// Variable instructions [https://www.w3.org/TR/2018/WD-wasm-core-1-20180215/#variable-instructions]
|
||||
// Variable instructions [https://www.w3.org/TR/wasm-core-1/#variable-instructions]
|
||||
|
||||
data class GetLocal(override val index: Int) : Instr(), Args.Index
|
||||
data class SetLocal(override val index: Int) : Instr(), Args.Index
|
||||
@ -222,7 +222,7 @@ sealed class Node {
|
||||
data class GetGlobal(override val index: Int) : Instr(), Args.Index
|
||||
data class SetGlobal(override val index: Int) : Instr(), Args.Index
|
||||
|
||||
// Memory instructions [https://www.w3.org/TR/2018/WD-wasm-core-1-20180215/#memory-instructions]
|
||||
// Memory instructions [https://www.w3.org/TR/wasm-core-1/#memory-instructions]
|
||||
|
||||
data class I32Load(override val align: Int, override val offset: Long) : Instr(), Args.AlignOffset
|
||||
data class I64Load(override val align: Int, override val offset: Long) : Instr(), Args.AlignOffset
|
||||
@ -250,7 +250,7 @@ sealed class Node {
|
||||
data class MemorySize(override val reserved: Boolean) : Instr(), Args.Reserved
|
||||
data class MemoryGrow(override val reserved: Boolean) : Instr(), Args.Reserved
|
||||
|
||||
// Numeric instructions [https://www.w3.org/TR/2018/WD-wasm-core-1-20180215/#numeric-instructions]
|
||||
// Numeric instructions [https://www.w3.org/TR/wasm-core-1/#numeric-instructions]
|
||||
|
||||
// Constants operators
|
||||
data class I32Const(override val value: Int) : Instr(), Args.Const<Int>
|
||||
|
@ -56,20 +56,16 @@ abstract class ScriptCommand<T> : Command<T>() {
|
||||
// if input file is class file
|
||||
"class" -> ctx.classLoader.addClass(File(inFile).readBytes()).let { ctx }
|
||||
// if input file is wasm file
|
||||
else -> {
|
||||
val translateCmd = Translate
|
||||
translateCmd.logger = this.logger
|
||||
translateCmd.inToAst(inFile, inFile.substringAfterLast('.')).let { inAst ->
|
||||
val (mod, name) = (inAst.commands.singleOrNull() as? Script.Cmd.Module) ?:
|
||||
else -> Translate.also { it.logger = logger }.inToAst(inFile, inFile.substringAfterLast('.')).let { inAst ->
|
||||
val (mod, name) = (inAst.commands.singleOrNull() as? Script.Cmd.Module) ?:
|
||||
error("Input file must only contain a single module")
|
||||
val className = name?.javaIdent?.capitalize() ?:
|
||||
val className = name?.javaIdent?.capitalize() ?:
|
||||
"Temp" + UUID.randomUUID().toString().replace("-", "")
|
||||
ctx.withCompiledModule(mod, className, name).let { ctx ->
|
||||
if (name == null && index != args.inFiles.size - 1)
|
||||
logger.warn { "File '$inFile' not last and has no name so will be unused" }
|
||||
if (name == null || args.disableAutoRegister) ctx
|
||||
else ctx.runCommand(Script.Cmd.Register(name, null))
|
||||
}
|
||||
ctx.withCompiledModule(mod, className, name).let { ctx ->
|
||||
if (name == null && index != args.inFiles.size - 1)
|
||||
logger.warn { "File '$inFile' not last and has no name so will be unused" }
|
||||
if (name == null || args.disableAutoRegister) ctx
|
||||
else ctx.runCommand(Script.Cmd.Register(name, null))
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -70,7 +70,7 @@ open class Translate : Command<Translate.Args>() {
|
||||
}
|
||||
}
|
||||
"wasm" ->
|
||||
Script(listOf(Script.Cmd.Module(BinaryToAst(logger = this.logger).toModule(
|
||||
Script(listOf(Script.Cmd.Module(BinaryToAst(logger = logger).toModule(
|
||||
ByteReader.InputStream(inBytes.inputStream())), null)))
|
||||
else -> error("Unknown in format '$inFormat'")
|
||||
}
|
||||
|
@ -4,13 +4,13 @@ import asmble.ast.Node
|
||||
import asmble.util.Logger
|
||||
|
||||
/**
|
||||
* Jvm context of execution a function.
|
||||
* Jvm context of the function execution.
|
||||
*
|
||||
* @param cls Class execution context
|
||||
* @param cls class execution context
|
||||
* @param node Ast of this function
|
||||
* @param insns A list of instructions
|
||||
* @param memIsLocalVar If true then function use only local variables and don't load
|
||||
* and store from memory.
|
||||
* @param insns instructions list
|
||||
* @param memIsLocalVar true if function uses only local variables and doesn't load
|
||||
* or store to/from memory.
|
||||
*/
|
||||
data class FuncContext(
|
||||
val cls: ClsContext,
|
||||
|
@ -2,11 +2,12 @@ package asmble.io
|
||||
|
||||
import asmble.ast.Node
|
||||
import asmble.util.*
|
||||
import java.io.ByteArrayInputStream
|
||||
import java.nio.ByteBuffer
|
||||
|
||||
open class BinaryToAst(
|
||||
val version: Long = 1L,
|
||||
val logger: Logger = Logger.Print(Logger.Level.WARN),
|
||||
val logger: Logger = Logger.Print(Logger.Level.OFF),
|
||||
val includeNameSection: Boolean = true
|
||||
) : Logger by logger {
|
||||
|
||||
|
@ -2,7 +2,7 @@ rootProject.name = 'asmble'
|
||||
include 'annotations',
|
||||
'compiler',
|
||||
'examples:c-simple',
|
||||
// 'examples:go-simple',
|
||||
// 'examples:rust-regex', // todo will be enabled when the problem with string max size will be solved
|
||||
'examples:go-simple',
|
||||
'examples:rust-regex',
|
||||
'examples:rust-simple',
|
||||
'examples:rust-string'
|
Reference in New Issue
Block a user