Merge pull request #20 from lastmjs/initial-structure

load hex into memory
lastmjs · Apr 24, 2018 · 83ba3d2 · 83ba3d2
2 parents cb280d8 + eb52feb
commit 83ba3d2
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 3 deletions.
diff --git a/elements/metal-micro-simulator.ts b/elements/metal-micro-simulator.ts
@@ -44,6 +44,12 @@ class MetalMicroSimulator extends HTMLElement {
  });
  }
 
+ loadClick(e: any) {
+ Store.dispatch({
+ type: 'LOAD_HEX_CODE_INTO_MEMORY'
+ });
+ }
+
  render() {
  const state: State = Store.getState();
 
@@ -70,7 +76,7 @@ class MetalMicroSimulator extends HTMLElement {
  <br>
 
  <div>
- Hex code to execute: 0x<input type="text" class="hexCodeInput" oninput="${(e: Event) => this.hexCodeInputChanged(e)}" value="${state.hexCode}">
+ Source code: 0x<input type="text" class="hexCodeInput" oninput="${(e: Event) => this.hexCodeInputChanged(e)}" value="${state.hexCode}"> <button onclick="${(e: Event) => this.loadClick(e)}">Load</button>
  </div>
 
  <div>
@@ -114,7 +120,7 @@ class MetalMicroSimulator extends HTMLElement {
  ${new Array(state.numberOfMemoryLocations).fill(0).map((x, index) => {
  return html`
  <div>
- ${index}: <input id="memoryLocation${index}" type="text">
+ ${index}: <input id="memoryLocation${index}" type="text" value="${state.memory[index]}">
  </div>
  `;
  })}

diff --git a/redux/redux-store.ts b/redux/redux-store.ts
@@ -16,7 +16,8 @@ const InitialState: State = {
  instructionCycle: 'OPCODE',
  registers: [],
  currentResult: '',
- numberOfCycles: 0
+ numberOfCycles: 0,
+ memory: []
 };
 
 const RootReducer = (state=InitialState, action: Action) => {
@@ -39,6 +40,26 @@ const RootReducer = (state=InitialState, action: Action) => {
  hexCode: action.hexCode
  };
  }
+ case 'LOAD_HEX_CODE_INTO_MEMORY':{
+ return {
+ ...state,
+ memory: state.hexCode.split('').reduce((result, character, index, array) => {
+ if (index >= array.length / 2) {
+ return result;
+ }
+ else {
+ return {
+ ...result,
+ finalArray: [...result.finalArray, `${array[result.index]}${array[result.index + 1]}`],
+ index: result.index + 2
+ };
+ }
+ }, {
+ finalArray: [],
+ index: 0
+ }).finalArray
+ };
+ }
  case 'STEP': {
  switch (state.instructionCycle) {
  case 'OPCODE': {

diff --git a/wasm-metal.d.ts b/wasm-metal.d.ts
@@ -8,6 +8,7 @@ export interface State {
  registers: string[];
  currentResult: '';
  numberOfCycles: number;
+ memory: string[];
 }
 
 export interface Action {