[RyuJit/WASM] Clean up some code

src/coreclr/jit/emit.h

@@ -3826,17 +3826,6 @@ inline UNATIVE_OFFSET emitter::emitDataSize()
     return emitConsDsc.dsdOffs;
 }
 
-/*****************************************************************************
- *
- *  Return a handle to the current position in the output stream. This can
- *  be later converted to an actual code offset in bytes.
- */
-
-inline void* emitter::emitCurBlock()
-{
-    return emitCurIG;
-}
-
 /*****************************************************************************
  *
  *  The emitCurOffset() method returns a cookie that identifies the current

src/coreclr/jit/emitpub.h

@@ -65,7 +65,6 @@ void emitFinishPrologEpilogGeneration();
 /*           Record a code position and later convert it to offset      */
 /************************************************************************/
 
-void*    emitCurBlock();
 unsigned emitCurOffset();
 unsigned emitSpecifiedOffset(unsigned insCount, unsigned igSize);
 

src/coreclr/jit/emitwasm.cpp

@@ -14,12 +14,6 @@
     #define INST(id, nm, info, fmt, opcode) info,
     #include "instrs.h"
 };
-
-static const uint8_t insOpcodes[]
-{
-    #define INST(id, nm, info, fmt, opcode) static_cast<uint8_t>(opcode),
-    #include "instrs.h"
-};
 // clang-format on
 
 void emitter::emitIns(instruction ins)
@@ -93,21 +87,25 @@ bool emitter::emitInsIsStore(instruction ins)
 
 emitter::insFormat emitter::emitInsFormat(instruction ins)
 {
-    // clang-format off
-    const static insFormat insFormats[] =
-    {
-        #define INST(id, nm, info, fmt, opcode) fmt,
-        #include "instrs.h"
+    static_assert(IF_COUNT < 255);
+
+    const static uint8_t insFormats[] = {
+#define INST(id, nm, info, fmt, opcode) fmt,
+#include "instrs.h"
     };
-    // clang-format on
 
     assert(ins < ArrLen(insFormats));
     assert((insFormats[ins] != IF_NONE));
-    return insFormats[ins];
+    return static_cast<insFormat>(insFormats[ins]);
 }
 
 static unsigned GetInsOpcode(instruction ins)
 {
+    static const uint8_t insOpcodes[] = {
+#define INST(id, nm, info, fmt, opcode) static_cast<uint8_t>(opcode),
+#include "instrs.h"
+    };
+
     assert(ins < ArrLen(insOpcodes));
     return insOpcodes[ins];
 }

src/coreclr/jit/instrswasm.h

@@ -20,8 +20,6 @@
 #error INST must be defined before including this file.
 #endif
 
-// TODO-WASM: fill out with more instructions (and everything else needed).
-//
 // clang-format off
 
 // control flow

src/coreclr/jit/registeropswasm.cpp

@@ -124,18 +124,6 @@ bool genIsValidFloatReg(regNumber reg)
     return (type == WasmValueType::F32) || (type == WasmValueType::F64);
 }
 
-bool isValidIntArgReg(regNumber reg, CorInfoCallConvExtension callConv)
-{
-    NYI_WASM("isValidIntArgReg");
-    return false;
-}
-
-bool isValidFloatArgReg(regNumber reg)
-{
-    NYI_WASM("isValidFloatArgReg");
-    return false;
-}
-
 const char* getRegName(regNumber reg)
 {
     if (reg == REG_NA)

src/coreclr/jit/registeropswasm.h

@@ -24,5 +24,3 @@ bool      genIsValidReg(regNumber reg);
 bool      genIsValidIntReg(regNumber reg);
 bool      genIsValidIntOrFakeReg(regNumber reg);
 bool      genIsValidFloatReg(regNumber reg);
-bool      isValidIntArgReg(regNumber reg, CorInfoCallConvExtension callConv);
-bool      isValidFloatArgReg(regNumber reg);