Delta encode pc descriptors.

runtime/vm/object_test.cc

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "platform/globals.h"
 
 #include "vm/assembler.h"
 #include "vm/class_finalizer.h"
 #include "vm/dart_api_impl.h"
 #include "vm/dart_entry.h"
 #include "vm/debugger.h"
 #include "vm/isolate.h"
 #include "vm/object.h"
 #include "vm/object_store.h"
 #include "vm/simulator.h"
 #include "vm/symbols.h"
 #include "vm/unit_test.h"
+#include "vm/code_descriptors.h"
 
 namespace dart {
 
 DECLARE_FLAG(bool, write_protect_code);
 
 static RawLibrary* CreateDummyLibrary(const String& library_name) {
   return Library::New(library_name);
 }
 
 
@@ skipping 2830 matching lines @@
   EXPECT(!handlers.HasCatchAll(0));
   EXPECT_EQ(20u, info.handler_pc_offset);
   EXPECT_EQ(1, handlers.OuterTryIndex(3));
   EXPECT_EQ(150u, handlers.HandlerPCOffset(3));
   EXPECT(!handlers.NeedsStacktrace(3));
   EXPECT(handlers.HasCatchAll(3));
 }
 
 
 TEST_CASE(PcDescriptors) {
-  const int kNumEntries = 6;
-  // Add PcDescriptors to the code.
+  DescriptorList* builder = new DescriptorList(0);
+
+  builder->AddDescriptor(RawPcDescriptors::kOther, 10, 1, 20, 1);
+  builder->AddDescriptor(RawPcDescriptors::kDeopt, 20, 2, 30, 0);
+  builder->AddDescriptor(RawPcDescriptors::kOther, 30, 3, 40, 1);
+  builder->AddDescriptor(RawPcDescriptors::kOther, 10, 4, 40, 2);
+  builder->AddDescriptor(RawPcDescriptors::kOther, 10, 5, 80, 3);
+  builder->AddDescriptor(RawPcDescriptors::kOther, 80, 6, 150, 3);

[Florian Schneider, 2015/05/11 11:10:56]

Please add a few test cases with larger deltas is outside the range of one-byte
encoding (+63/-64)

[rmacnak, 2015/05/11 20:27:04]

Done.

+
   PcDescriptors& descriptors = PcDescriptors::Handle();
-  descriptors ^= PcDescriptors::New(kNumEntries, true);
-  descriptors.AddDescriptor(0, 10, RawPcDescriptors::kOther, 1, 20, 1);
-  descriptors.AddDescriptor(1, 20, RawPcDescriptors::kDeopt, 2, 30, 0);
-  descriptors.AddDescriptor(2, 30, RawPcDescriptors::kOther, 3, 40, 1);
-  descriptors.AddDescriptor(3, 10, RawPcDescriptors::kOther, 4, 40, 2);
-  descriptors.AddDescriptor(4, 10, RawPcDescriptors::kOther, 5, 80, 3);
-  descriptors.AddDescriptor(5, 80, RawPcDescriptors::kOther, 6, 150, 3);
+  descriptors ^= builder->FinalizePcDescriptors(0);
 
   extern void GenerateIncrement(Assembler* assembler);
   Assembler _assembler_;
   GenerateIncrement(&_assembler_);
   Code& code = Code::Handle(Code::FinalizeCode(
       *CreateFunction("Test_Code"), &_assembler_));
   code.set_pc_descriptors(descriptors);
 
   // Verify the PcDescriptor entries by accessing them.
   const PcDescriptors& pc_descs = PcDescriptors::Handle(code.pc_descriptors());
@@ skipping 24 matching lines @@
 
   EXPECT_EQ(3, iter.TryIndex());
   EXPECT_EQ(static_cast<uword>(80), iter.PcOffset());
   EXPECT_EQ(150, iter.TokenPos());
   EXPECT_EQ(RawPcDescriptors::kOther, iter.Kind());
 
   EXPECT_EQ(false, iter.MoveNext());
 }
 
 
-TEST_CASE(PcDescriptorsCompressed) {
-  const int kNumEntries = 6;
-  // Add PcDescriptors to the code.
-  PcDescriptors& descriptors = PcDescriptors::Handle();
-  // PcDescriptors have no try-index.
-  descriptors ^= PcDescriptors::New(kNumEntries, false);
-  descriptors.AddDescriptor(0, 10, RawPcDescriptors::kOther, 1, 20, -1);
-  descriptors.AddDescriptor(1, 20, RawPcDescriptors::kDeopt, 2, 30, -1);
-  descriptors.AddDescriptor(2, 30, RawPcDescriptors::kOther, 3, 40, -1);
-  descriptors.AddDescriptor(3, 10, RawPcDescriptors::kOther, 4, 40, -1);
-  descriptors.AddDescriptor(4, 10, RawPcDescriptors::kOther, 5, 80, -1);
-  descriptors.AddDescriptor(5, 80, RawPcDescriptors::kOther, 6, 150, -1);
-
-  extern void GenerateIncrement(Assembler* assembler);
-  Assembler _assembler_;
-  GenerateIncrement(&_assembler_);
-  Code& code = Code::Handle(Code::FinalizeCode(
-      *CreateFunction("Test_Code"), &_assembler_));
-  code.set_pc_descriptors(descriptors);
-
-  // Verify the PcDescriptor entries by accessing them.
-  const PcDescriptors& pc_descs = PcDescriptors::Handle(code.pc_descriptors());
-  PcDescriptors::Iterator iter(pc_descs, RawPcDescriptors::kAnyKind);
-
-  EXPECT_EQ(true, iter.MoveNext());
-  EXPECT_EQ(static_cast<uword>(10), iter.PcOffset());
-  EXPECT_EQ(-1, iter.TryIndex());
-  EXPECT_EQ(1, iter.DeoptId());
-  EXPECT_EQ(20, iter.TokenPos());
-
-  EXPECT_EQ(true, iter.MoveNext());
-  EXPECT_EQ(true, iter.MoveNext());
-  EXPECT_EQ(true, iter.MoveNext());
-  EXPECT_EQ(true, iter.MoveNext());
-  EXPECT_EQ(true, iter.MoveNext());
-
-  EXPECT_EQ(-1, iter.TryIndex());
-  EXPECT_EQ(static_cast<uword>(80), iter.PcOffset());
-  EXPECT_EQ(150, iter.TokenPos());
-
-  EXPECT_EQ(false, iter.MoveNext());
-}
-
-
-
 static RawClass* CreateTestClass(const char* name) {
   const String& class_name = String::Handle(Symbols::New(name));
   const Class& cls = Class::Handle(
       CreateDummyClass(class_name, Script::Handle()));
   return cls.raw();
 }
 
 
 static RawField* CreateTestField(const char* name) {
   const Class& cls = Class::Handle(CreateTestClass("global:"));
@@ skipping 1601 matching lines @@
   EXPECT_VALID(h_result);
   Integer& result = Integer::Handle();
   result ^= Api::UnwrapHandle(h_result);
   String& foo = String::Handle(String::New("foo"));
   Integer& expected = Integer::Handle();
   expected ^= foo.HashCode();
   EXPECT(result.IsIdenticalTo(expected));
 }
 
 }  // namespace dart