This change contains changes that were made on a separate copy of this code,...

src/trusted/gdb_rsp/packet.cc

 /*
  * Copyright 2010 The Native Client Authors. All rights reserved.
  * Use of this source code is governed by a BSD-style license that can
  * be found in the LICENSE file.
  */
 
 
 #include <assert.h>
 #include <string.h>
 #include <stdlib.h>
@@ skipping 247 matching lines @@
 
 bool Packet::GetWord8(uint8_t *ch) {
   assert(ch);
 
   char seq1, seq2;
   int  val1, val2;
 
   // Get two ASCII hex values
   if (!GetRawChar(&seq1)) return false;
   if (!GetRawChar(&seq2)) return false;
 

[noelallen_use_chromium, 2010/12/07 23:04:44]

This looks like it should be removed.  Accidental debugging spew from
development?

[mlinck, 2010/12/10 21:10:27]

Done.

+  printf("GetWord8 got chars: %c %c\n", seq1, seq2);

[mmortensen, 2010/12/07 22:53:58]

Having the printf is probably a big help here, since it's hard to debug the
debugger.  Two questions:
   1) Do we need to guard them with a boolean variable or ifdefs?
   2) Should other functions (GetWord16, GetWord32) also consistently printf for
debug help?

I'm not sure the answer to the questions, but it's worth thinking about while
you are in the code.

[mlinck, 2010/12/10 21:10:27]

removed this

+
   // Convert them to ints
   if (!NibbleToInt(seq1, &val1)) return false;
   if (!NibbleToInt(seq2, &val2)) return false;
 
   *ch = (val1 << 4) + val2;
   return true;
 }
 
 bool Packet::GetBlock(void *ptr, uint32_t len) {
   assert(ptr);
@@ skipping 13 matching lines @@
   assert(ptr);
   return GetBlock(ptr, sizeof(*ptr));
 }
 
 bool Packet::GetWord32(uint32_t *ptr) {
   assert(ptr);
   return GetBlock(ptr, sizeof(*ptr));
 }
 
 bool Packet::GetWord64(uint64_t *ptr) {
+  printf("GetWord64 running \n");

[noelallen_use_chromium, 2010/12/07 23:04:44]

same.

[mlinck, 2010/12/10 21:10:27]

Done.

   assert(ptr);
   return GetBlock(ptr, sizeof(*ptr));
 }
 
 
 bool Packet::GetString(string* str) {
   if (EndOfPacket()) return false;
 
   *str = &data_[read_index_];
   read_index_ = write_index_;
@@ skipping 71 matching lines @@
 
   return false;
 }
 
 void Packet::SetSequence(int32_t val) {
   seq_ = val;
 }
 
 }  // namespace gdb_rsp