[llvm-commits] [vmkit] r51332 - in /vmkit/trunk/lib/JnJVM/VMCore: Reader.cpp Reader.h

[Nicolas Geoffray]

Author: geoffray
Date: Tue May 20 15:42:53 2008
New Revision: 51332

URL: http://llvm.org/viewvc/llvm-project?rev=51332&view=rev
Log:
Inline simple functions.


Modified:
    vmkit/trunk/lib/JnJVM/VMCore/Reader.cpp
    vmkit/trunk/lib/JnJVM/VMCore/Reader.h

Modified: vmkit/trunk/lib/JnJVM/VMCore/Reader.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/VMCore/Reader.cpp?rev=51332&r1=51331&r2=51332&view=diff

==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/Reader.cpp (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/Reader.cpp Tue May 20 15:42:53 2008
@@ -20,34 +20,6 @@
 
 using namespace jnjvm;
 
-double Reader::readDouble(int first, int second) {
-  int values[2];
-  double res[1];
-#if defined(__PPC__)
-  values[0] = second;
-  values[1] = first;
-#else
-  values[0] = first;
-  values[1] = second;
-#endif
-  memcpy(res, values, 8); 
-  return res[0];
-}
-
-sint64 Reader::readLong(int first, int second) {
-  int values[2];
-  sint64 res[1];
-#if defined(__PPC__)
-  values[0] = second;
-  values[1] = first;
-#else
-  values[0] = first;
-  values[1] = second;
-#endif
-  memcpy(res, values, 8); 
-  return res[0];
-}
-
 const int Reader::SeekSet = SEEK_SET;
 const int Reader::SeekCur = SEEK_CUR;
 const int Reader::SeekEnd = SEEK_END;
@@ -81,56 +53,6 @@
   return ret;
 }
 
-uint8 Reader::readU1() {
-  return bytes->at(cursor++);
-}
-
-sint8 Reader::readS1() {
-  return readU1();
-}
-
-uint16 Reader::readU2() {
-  uint16 tmp = ((uint16)(readU1())) << 8;
-  return tmp | ((uint16)(readU1()));
-}
-
-sint16 Reader::readS2() {
-  sint16 tmp = ((sint16)(readS1())) << 8;
-  return tmp | ((sint16)(readS1()));
-}
-
-uint32 Reader::readU4() {
-  uint32 tmp = ((uint32)(readU2())) << 16;
-  return tmp | ((uint32)(readU2()));
-}
-
-sint32 Reader::readS4() {
-  sint32 tmp = ((sint32)(readS2())) << 16;
-  return tmp | ((sint32)(readS2()));
-}
-
-uint64 Reader::readU8() {
-  uint64 tmp = ((uint64)(readU4())) << 32;
-  return tmp | ((uint64)(readU4()));
-}
-
-sint64 Reader::readS8() {
-  sint64 tmp = ((sint64)(readS8())) << 32;
-  return tmp | ((sint64)(readS8()));
-}
-
-Reader::Reader(ArrayUInt8* array, uint32 start, uint32 end) {
-  if (!end) end = array->size;
-  this->bytes = array;
-  this->cursor = start;
-  this->min = start;
-  this->max = start + end;
-}
-
-unsigned int Reader::tell() {
-  return cursor - min;
-}
-
 Reader* Reader::derive(Jnjvm* vm, uint32 nbb) {
   return vm_new(vm, Reader)(bytes, cursor, nbb);
 }

Modified: vmkit/trunk/lib/JnJVM/VMCore/Reader.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/VMCore/Reader.h?rev=51332&r1=51331&r2=51332&view=diff

==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/Reader.h (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/Reader.h Tue May 20 15:42:53 2008
@@ -14,9 +14,10 @@
 
 #include "types.h"
 
+#include "JavaArray.h"
+
 namespace jnjvm {
 
-class ArrayUInt8;
 class Jnjvm;
 
 class Reader : public mvm::Object {
@@ -27,8 +28,34 @@
   uint32 cursor;
   uint32 max;
 
-  static double readDouble(int first, int second);
-  static sint64 readLong(int first, int second);
+  static double readDouble(int first, int second) {
+    int values[2];
+    double res[1];
+#if defined(__PPC__)
+    values[0] = second;
+    values[1] = first;
+#else
+    values[0] = first;
+    values[1] = second;
+#endif
+    memcpy(res, values, 8); 
+    return res[0];
+  }
+
+
+  static sint64 readLong(int first, int second) {
+    int values[2];
+    sint64 res[1];
+#if defined(__PPC__)
+    values[0] = second;
+    values[1] = first;
+#else
+    values[0] = first;
+    values[1] = second;
+#endif
+    memcpy(res, values, 8); 
+    return res[0];
+  }
 
   static const int SeekSet;
   static const int SeekCur;
@@ -36,19 +63,61 @@
 
   static ArrayUInt8* openFile(Jnjvm* vm, char* path);
   static ArrayUInt8* openZip(Jnjvm* vm, char* zipname, char* filename);
-  uint8 readU1();
-  sint8 readS1();
-  uint16 readU2();
-  sint16 readS2();
-  uint32 readU4();
-  sint32 readS4();
-  uint64 readU8();
-  sint64 readS8();
-  Reader(ArrayUInt8* array, uint32 start = 0, uint32 end = 0);
+  
+  uint8 readU1() {
+    return bytes->elements[cursor++];
+  }
+  
+  sint8 readS1() {
+    return bytes->elements[cursor++];
+  }
+  
+  uint16 readU2() {
+    uint16 tmp = ((uint16)(readU1())) << 8;
+    return tmp | ((uint16)(readU1()));
+  }
+  
+  sint16 readS2() {
+    sint16 tmp = ((sint16)(readS1())) << 8;
+    return tmp | ((sint16)(readS1()));
+  }
+  
+  uint32 readU4() {
+    uint32 tmp = ((uint32)(readU2())) << 16;
+    return tmp | ((uint32)(readU2()));
+  }
+  
+  sint32 readS4() {
+    sint32 tmp = ((sint32)(readS2())) << 16;
+    return tmp | ((sint32)(readS2()));
+  }
+
+  uint64 readU8() {
+    uint64 tmp = ((uint64)(readU4())) << 32;
+    return tmp | ((uint64)(readU4()));
+  }
+  
+  sint64 readS8() {
+    sint64 tmp = ((sint64)(readS8())) << 32;
+    return tmp | ((sint64)(readS8()));
+  }
+
+  Reader(ArrayUInt8* array, uint32 start = 0, uint32 end = 0) {
+    if (!end) end = array->size;
+    this->bytes = array;
+    this->cursor = start;
+    this->min = start;
+    this->max = start + end;
+  }
+
   Reader() {}
-  unsigned int tell();
-  Reader* derive(Jnjvm* vm, uint32 nbb);
+  
+  unsigned int tell() {
+    return cursor - min;
+  }
+  
   void seek(uint32 pos, int from);
+  Reader* derive(Jnjvm* vm, uint32 nbb);
 
   virtual void print(mvm::PrintBuffer* buf) const;
   virtual void TRACER;