Expanding statistics

Author: danijelaskov

src/app/bytecode-reader/bytecode-reader.component.ts

@@ -28,19 +28,20 @@ import { faFolderOpen } from '@fortawesome/free-solid-svg-icons';
 })
 export class BytecodeReaderComponent implements OnInit {
 
- file: any;
- @Output("bytecode") bytecodeEmitter: EventEmitter<ArrayBuffer> = new EventEmitter();
- uploadedFileName: string = "simple_calculator.obj";
- folderOpenIcon: IconDefinition = faFolderOpen;
+ private file: any;
+ @Output("bytecode") public bytecodeEmitter: EventEmitter<ArrayBuffer> = new EventEmitter();
+ public uploadedFileName: string = "simple_calculator.obj";
+ public folderOpenIcon: IconDefinition = faFolderOpen;
 
  constructor() { }
 
  ngOnInit() {
  }
 
  fileChanged(event: Event) {
- if ((event.target as HTMLInputElement).files.length > 0) {
- this.file = (event.target as HTMLInputElement).files[0];
+ let eventTarget = event.target as HTMLInputElement;
+ if (eventTarget.files.length > 0) {
+ this.file = eventTarget.files[0];
  this.emitBytes();
  } else {
  this.bytecodeEmitter.emit(null);

src/app/shared/disassembler.shared.ts

@@ -121,8 +121,8 @@ export class Disassembler {
  public static readonly ARRAYLENGTH: Instruction = {mnemonic: "arraylength", opcode: 38};
 
  public static readonly POP: Instruction = {mnemonic: "pop", opcode: 39};
- public static readonly DUP: Instruction = {mnemonic: "dup_x1", opcode: 40};
- public static readonly DUP2: Instruction = {mnemonic: "dup_x2", opcode: 41};
+ public static readonly DUP: Instruction = {mnemonic: "dup", opcode: 40};
+ public static readonly DUP2: Instruction = {mnemonic: "dup2", opcode: 41};
 
  public static readonly JMP: Instruction = {mnemonic: "jmp", opcode: 42};
  public static readonly JEQ: Instruction = {mnemonic: "jeq", opcode: 43};

src/app/stats/stats.component.html

@@ -69,6 +69,16 @@ <h3>General</h3>
 </table>
 <h3>Instructions</h3>
 <hr />
+<p>
+ This object file contains {{this.instructionCountArray.length}} out of {{this.totalNumInstructions}} available instructions, which is {{((this.instructionCountArray.length / this.totalNumInstructions) * 100).toFixed(2)}}% of the instruction set.
+ <span *ngIf="this.leftOutInstructions.length">Instructions that do not appear in this object file are:</span>
+</p>
+<ol *ngIf="this.leftOutInstructions.length">
+ <li *ngFor="let leftOutInstruction of this.leftOutInstructions">
+ <code>{{leftOutInstruction.mnemonic}}</code>
+ </li>
+</ol>
+<p>Instructions that do appear in this object file are:</p>
 <div class="table-responsive">
  <table class="table table-bordered table-hover">
  <thead>

src/app/stats/stats.component.ts

@@ -37,6 +37,9 @@ export class StatsComponent implements OnInit {
  private instructionCount = {};
  public instructionCountArray = [];
 
+ public totalNumInstructions = Disassembler.INSTRUCTIONS.length;
+ public leftOutInstructions = Object.assign([], Disassembler.INSTRUCTIONS);
+
  constructor() { }
 
  ngOnInit() {
@@ -77,6 +80,9 @@ export class StatsComponent implements OnInit {
  mnemonic: key,
  count: this.instructionCount[key]
  });
+ this.leftOutInstructions.splice(this.leftOutInstructions.findIndex((instruction) => {
+ return instruction.mnemonic === key;
+ }), 1);
  }
  this.instructionCountArray.sort((ic1, ic2) => {
  return ic2.count - ic1.count;