Vm rebuild #34

Ryex · 2024-05-01T01:00:52Z

Goal here is to move the VM to using dynamic objects allowing the Game's logic to be modeled much more closely.

generic object trait
codegen the traits, enums, etc for instructions and logic
new frozen object interface, potential for less JSON when state is saved if the object template are in the database
lots of interface traits to handle logic
load/build ItemIntergretedCircuit10 from ObjectTemplate (relatively easy)
implementing the known circuit holders (both housings, tablet, suit)
remap the WASM interface
fix frontend to use new template system
clean up new errors to reach parity with devleop

Signed-off-by: Rachel Powers <[email protected]>

…e stationpedia prefab enum Signed-off-by: Rachel Powers <[email protected]>

Ryex · 2024-05-01T04:26:30Z

@ComputerDruid @Emilgardis if you want to stay away from this one I won't blame you. lots of macro work in these early stages.

Suffice it to say that I've built a rather nice and clean macro derivable Object interface trait that I'll be using to rework the rest of the VM.

Ie. when I'm done as far as the VM is concerned a circuit housing is nothing more than an Object implementing the CircuitHolder trait and anything with memory is just an object that implements Memory + (MemoryReadable &| MemoryWritable)
same with logic and Logicable

… special logic) Signed-off-by: Rachel Powers <[email protected]>

github-actions · 2024-05-01T23:21:35Z

🚀 Deployed on https://deploy-preview-34--ic10emu.netlify.app

Emilgardis

Looks great!

xtask/src/generate.rs

Emilgardis · 2024-05-08T05:37:54Z

xtask/src/generate.rs

+    Ok(())
+}
+
+pub fn parse_json<'a, T: serde::Deserialize<'a>>(


Hehe, i recognize this

its' a very nice function, I wrote a much less friendly version once. I prefer this.

xtask/src/stationpedia.rs

xtask/src/main.rs

xtask/src/generate/instructions.rs

ic10emu/src/vm/object/mod.rs

xtask/Cargo.toml

xtask/src/generate/database.rs

xtask/src/generate/instructions.rs

xtask/Cargo.toml

Ryex · 2024-05-15T06:59:36Z

phew... finally getting close to parity after the rewrite. so much code...
once I finish off porting the instructions to traits it will just be a case of

load/build ItemIntergretedCircuit10 from ObjectTemplate (relatively easy)
implementing the known circuit holders (both housings, tablet, suit)
remap the WASM interface
fix frontend to use new template system

at this point the VM and object system is stable, so if anyone wants to double check it for my sanity that would be great.

pregenerate prefab templates -> locked behind crate feature

- let vm carry object dtabase - seperate frozen object info and templates

Ryex · 2024-05-27T11:15:48Z

manic laughing commences
@Emilgardis
@ComputerDruid
It's Done.
the Rust rebuild is complete.

I now have to remap the wasm bindings and fix the frontend

Emilgardis · 2024-05-27T12:41:59Z

😵

xtask/src/generate/instructions.rs

ic10emu/src/vm/instructions/traits.rs

Emilgardis · 2024-05-27T15:01:19Z

ic10emu/src/vm/instructions/enums.rs

@@ -0,0 +1,1567 @@
+use serde_derive::{Deserialize, Serialize};


missing a big disclaimer that this is code-gen, I still feel like it should be put in a path like src/vm/instructions/codegen/ so that it's clear by just lookit at the file that it's code-gen, instead of only having to scroll up and seeing a disclaimer.

Same for traits.rs

apparently quote does not preserve comments. fixed

ic10emu/src/vm/object/stationpedia/structs/circuit_holder.rs

ic10emu/src/vm/object/errors.rs

ic10emu/src/vm/object/stationpedia.rs

Emilgardis · 2024-05-27T15:12:35Z

ic10emu/src/vm/object/templates.rs

+    }
+}
+
+impl ObjectInfo {


should probably document these functions

Emilgardis · 2024-05-27T15:13:15Z

ic10emu/src/vm/object/traits.rs

+        fn get_radiation_factor(&self) -> f32;
+    }
+
+    pub trait IntegratedCircuit: Logicable + MemoryWritable + SourceCode + Item {


some documentation on these functions would be nice

Is this what you were looking for? or should I be more in depth?

looks good to me!

ic10emu/src/grammar.rs

Emilgardis · 2024-05-27T15:16:30Z

ic10emu/src/interpreter.rs

@@ -2626,80 +214,87 @@ pub fn i64_to_f64(i: i64) -> f64 {

 #[cfg(test)]
 mod tests {
-    use crate::vm::VMError;
-
-    use super::*;



don't forget these tests!

opp! your right. I commented them out during the rebuild because the interface changed a lot.
Fixed and passing.

…ct mixin, proxy vm to webworker to avoid hogging main thread

- parse and map meory instructions - use FrozenObjectFull to propogate data out of VM to componates (far less wasm calls)

…ontend

…ies of TSify are borken...

…body render untill VM is fully loaded

smaller DOM updates & easier data update paths. fix sl-select problems with force update on signal sub Signed-off-by: Rachel Powers <[email protected]>

Signed-off-by: Rachel Powers <[email protected]>

…ization Signed-off-by: Rachel Powers <[email protected]>

Signed-off-by: Rachel Powers <[email protected]>

Ryex added 4 commits April 30, 2024 11:26

start building macros for VMObject trait

2536af8

Signed-off-by: Rachel Powers <[email protected]>

refactor: intorduction of a macro enabled Object trait

a332163

Signed-off-by: Rachel Powers <[email protected]>

refactor(vm::objects): Establixh base object macros and traits

6bdc6f2

Signed-off-by: Rachel Powers <[email protected]>

refactor(vm): use proper repr on generated enums if possible, generat…

c318203

…e stationpedia prefab enum Signed-off-by: Rachel Powers <[email protected]>

refactor(vm): generic impls for generic Objects (not implimented with…

2d8b35c

… special logic) Signed-off-by: Rachel Powers <[email protected]>

refactor(vm) helpful codegen round 1~

5cc935b

Emilgardis reviewed May 8, 2024

View reviewed changes

Ryex added 13 commits May 7, 2024 23:09

refactor(vm) cleanup errors

48fbe67

refactor(vm) cleanup serde_derive usage

371167d

refactor(vm) use generated enums wherever possible

096e272

refactor(vm) checkup - ensure tests pass

095e17a

refactor(vm) start impl of IC trait function

17bde04

refactor(vm) start reimpl of VM struct using object trait

8288d8a

refactor(vm): start freezeing objects impl

347f5f1

refactor(vm): use From<T> in freeze object

d6ebbcf

refactor(vm): VMObjects should carry around a VM reference

de2698c

chore(vm): clean up spelling and RC usage

7b8523d

refactor(vm): re impl freezing VM using ObjectTemplates

708d68e

refactor(vm): update up codegen, remove duplicated enums

25b7046

refactor(vm): more ic10 instruction impls

0c5e2b2

Ryex added 7 commits May 15, 2024 16:43

rafactor(vm): end instruction impl

e928813

refactor(vm): cleanup borrow usage, impl slot logic

cc6cc35

refactor(vm): impl circuit holder, impl ObjectRef/Mut

29ef54c

chore(clippy): sweep sweep sweep

b0bdc37

refactor(vm): pull generated data into new crate

4346bc5

pregenerate prefab templates -> locked behind crate feature

refactor(vm): update prefab database with new data

bc84200

refactor(vm): drop null fields from json

d79726a

Ryex added 4 commits May 23, 2024 23:04

refactor(vm): rework object freazing

24778b2

- let vm carry object dtabase - seperate frozen object info and templates

refactor(vm): generic circuit holder + suit impl

d70d3a2

refactor(vm): freeze concreet ic, add "humans", tsify feature

88ff2d1

refactor(vm): make wasmbindings build again, use tsify for types

dae6be9

Emilgardis reviewed May 27, 2024

View reviewed changes

Ryex added 20 commits May 27, 2024 22:12

refactor(vm): cleanup, trait docs, reenable interpreter tests

1843bdb

refactor(wasm): remap wasm interface (rust side)

7efcec9

chore(codegen): generate json database in www/data

e4167ef

refactor(frontend): use new frozen object to fill values for baseObje…

c1f4cb2

…ct mixin, proxy vm to webworker to avoid hogging main thread

refactor(vm, frontend): memory instructions, baseObject

7b6909a

- parse and map meory instructions - use FrozenObjectFull to propogate data out of VM to componates (far less wasm calls)

refactor(frontend): fix base template component

10997d4

refactor(frontend): fix slot occupant and device add components

337ca50

refactor(vm, frontend): internally tag template enum, finish remap fr…

d618f7b

…ontend

refactor(vm, frontend): turns out that the serde_wasm_bindgen facilit…

6c26a37

…ies of TSify are borken...

refactor(frontend): Maps are dea dlong live Objects, also delay main …

3da16d1

…body render untill VM is fully loaded

refactor(ui): start using signals

70833e0

smaller DOM updates & easier data update paths. fix sl-select problems with force update on signal sub Signed-off-by: Rachel Powers <[email protected]>

refactor(frontend) finish signal conversion, fix passing data to VM

b1c9db2

Signed-off-by: Rachel Powers <[email protected]>

refactor(frontend): fix signal graph

6e503f9

refactor(frontend) fix template searching, update database images

f40437e

Signed-off-by: Rachel Powers <[email protected]>

refactor(frontend): fix loading code to editor

c810806

Signed-off-by: Rachel Powers <[email protected]>

refactor(vm): add proper reagent interface, trace VM, fix slot serial…

08c42a2

…ization Signed-off-by: Rachel Powers <[email protected]>

refactor(vm): fix Reagent code gen

6e80f21

Signed-off-by: Rachel Powers <[email protected]>

refactor(frontend): use signals in Session, fix various things

f05f81c

Signed-off-by: Rachel Powers <[email protected]>

refactor(vm+frontend): better logging, fix slot serialization

a34fb42

Signed-off-by: Rachel Powers <[email protected]>

refactor(frontend): bump rebuild to v1.0

87959ef

Signed-off-by: Rachel Powers <[email protected]>

Ryex marked this pull request as ready for review September 17, 2024 22:16

Ryex merged commit 57ec19f into develop Sep 17, 2024
2 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Vm rebuild #34

Vm rebuild #34

Ryex commented May 1, 2024 •

edited

Loading

Ryex commented May 1, 2024 •

edited

Loading

github-actions bot commented May 1, 2024 •

edited

Loading

Emilgardis left a comment

Emilgardis May 8, 2024

Ryex May 8, 2024

Ryex commented May 15, 2024 •

edited

Loading

Ryex commented May 27, 2024

Emilgardis commented May 27, 2024

Emilgardis May 27, 2024

Ryex May 28, 2024 •

edited

Loading

Emilgardis May 27, 2024

Ryex May 28, 2024

Emilgardis May 27, 2024

Ryex May 28, 2024

Emilgardis Jun 2, 2024

Emilgardis May 27, 2024

Ryex May 28, 2024

		@@ -0,0 +1,1567 @@
		use serde_derive::{Deserialize, Serialize};

Vm rebuild #34

Vm rebuild #34

Conversation

Ryex commented May 1, 2024 • edited Loading

Ryex commented May 1, 2024 • edited Loading

github-actions bot commented May 1, 2024 • edited Loading

Emilgardis left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Ryex commented May 15, 2024 • edited Loading

Ryex commented May 27, 2024

Emilgardis commented May 27, 2024

Choose a reason for hiding this comment

Ryex May 28, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Ryex commented May 1, 2024 •

edited

Loading

Ryex commented May 1, 2024 •

edited

Loading

github-actions bot commented May 1, 2024 •

edited

Loading

Ryex commented May 15, 2024 •

edited

Loading

Ryex May 28, 2024 •

edited

Loading