Skip to content

Commit

Permalink
Merge pull request #3 from robalb/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
robalb authored Oct 18, 2024
2 parents f480fa7 + f93c4c5 commit b192465
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 313 deletions.
2 changes: 1 addition & 1 deletion readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Try a demo on https://x64.halb.it

The project is composed of two elements:
- `emscripten_blink` a fork of the [blink](https://github.com/jart/blink/) x86-64 emulator, modified to expose a javascript api when compiled for webassembly.
- `svelte_blinkenweb` a svelte webapp implementing the frontend for the blink wasm emulator.
- `svelte_blinkenweb` a svelte webapp implementing a mobile-friendly frontend for the blink wasm emulator.

The assemblers provided by the app are traditional x86-64 ELFs, emulated client-side in the blink runtime.

Expand Down
6 changes: 3 additions & 3 deletions svelte_blinkenweb/src/DesktopLayout.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import Controls from './components/Controls.svelte';
</Pane>

<PaneResizer class="pf__resizer pf__resizer--vertical" />
<Pane defaultSize={30} class="pf__pane pf__pane--h100">
<Pane defaultSize={25} class="pf__pane pf__pane--h100">
<div class="pane">
<div class="pane__bar">
<p>Disassembly</p>
Expand All @@ -35,7 +35,7 @@ import Controls from './components/Controls.svelte';
</Pane>

<PaneResizer class="pf__resizer pf__resizer--vertical" />
<Pane defaultSize={15} class="pf__pane pf__pane--h100">
<Pane defaultSize={20} class="pf__pane pf__pane--h100">
<PaneGroup direction="vertical" class="pf__panegroup pf__panegroup--vertical">
<Pane defaultSize={50} class="pf__pane">
<div class="pane">
Expand All @@ -61,7 +61,7 @@ import Controls from './components/Controls.svelte';
</PaneGroup>
</Pane>
<PaneResizer class="pf__resizer pf__resizer--vertical" />
<Pane defaultSize={25} class="pf__pane pf__pane--h100">
<Pane defaultSize={30} class="pf__pane pf__pane--h100">
<div class="pane">
<div class="pane__bar">
<p>Stack memory</p>
Expand Down
3 changes: 1 addition & 2 deletions svelte_blinkenweb/src/MobileLayout.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -309,8 +309,7 @@ $: showEditor = (
width: 100%;
height: 100%;
overflow: auto;
margin-bottom: 3rem;
padding-bottom: 3rem;
}
[role="tabpanel"].is-hidden {
Expand Down
305 changes: 0 additions & 305 deletions svelte_blinkenweb/src/components/Controls-old.svelte

This file was deleted.

5 changes: 4 additions & 1 deletion svelte_blinkenweb/src/components/Controls.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@


{#if mobile && !showEditor && $state == blink.states.PROGRAM_STOPPED}
<p class="stopinfo">exit reason</p>
<p class="stopinfo">{blink.stopReason.details}</p>
{/if}


Expand Down Expand Up @@ -277,6 +277,9 @@
border-top-left-radius: 0;
border-bottom-left-radius: 0;
}
.group button:active:not(:disabled):nth-child(1){/* I hereby challenge you to write a line with more selectors */
border-right: 1px solid rgba(255,255,255,0.7);
}
.compilebt{
Expand Down
3 changes: 2 additions & 1 deletion svelte_blinkenweb/src/styles/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@
font-family: 'Roboto Mono';
font-style: normal;
font-weight: 400;
font-display: optional;
/* font-display: optional; */
font-display: block; /* will generate a FOUT, but we really need this specific font */
src: local(''),
url('../assets/fonts/roboto-mono-v21-latin-regular.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
url('../assets/fonts/roboto-mono-v21-latin-regular.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
Expand Down

0 comments on commit b192465

Please sign in to comment.