Menu
▾
▴
[X10-commits] SF.net SVN: x10:[16658] trunk
|
From: <bh...@us...> - 2010-09-23 14:25:19
|
Revision: 16658
http://x10.svn.sourceforge.net/x10/?rev=16658&view=rev
Author: bherta
Date: 2010-09-23 14:25:12 +0000 (Thu, 23 Sep 2010)
Log Message:
-----------
updates for debug.h from debugger team, and the bare minimal updates to LineNumberMap so that things still compile
Modified Paths:
--------------
trunk/x10.compiler/src/x10cpp/debug/LineNumberMap.java
trunk/x10.runtime/src-cpp/x10aux/debug.h
Modified: trunk/x10.compiler/src/x10cpp/debug/LineNumberMap.java
===================================================================
--- trunk/x10.compiler/src/x10cpp/debug/LineNumberMap.java 2010-09-23 13:42:39 UTC (rev 16657)
+++ trunk/x10.compiler/src/x10cpp/debug/LineNumberMap.java 2010-09-23 14:25:12 UTC (rev 16658)
@@ -676,8 +676,8 @@
w.write(""+offsets[cppMethodInfo.x10class]+", "); // _x10class
w.write(""+offsets[cppMethodInfo.x10method]+", "); // _x10method
w.write(""+offsets[cppMethodInfo.x10rettype]+", "); // _x10returnType
- w.write("(uint64_t) 0, "); // TODO - this needs to be re-designed, with the debugger team
w.write(""+offsets[cppMethodInfo.cppclass]+", "); // _cppClass
+ w.write("(uint64_t) 0, "); // TODO - this needs to be re-designed, with the debugger team
w.write(""+cppMethodInfo.x10args.length+", "); // _x10argCount
w.write(""+cppMethodInfo.cpplineindex); // _lineIndex
w.writeln(" },");
@@ -688,13 +688,13 @@
w.write(""+offsets[cppMethodInfo.x10class]+", "); // _x10class
w.write(""+offsets[cppMethodInfo.x10method]+", "); // _x10method
w.write(""+offsets[cppMethodInfo.x10rettype]+", "); // _x10returnType
+ w.write(""+offsets[cppMethodInfo.cppclass]+", "); // _cppClass
w.write("(uint64_t) ");
for (i = 0; i < cppMethodInfo.x10args.length; i++) {
int a = cppMethodInfo.x10args[i];
w.write("\""+encodeIntAsChars(offsets[a])+"\" "); // _x10args
}
w.write("\"\", ");
- w.write(""+offsets[cppMethodInfo.cppclass]+", "); // _cppClass
w.write(""+cppMethodInfo.x10args.length+", "); // _x10argCount
w.write(""+cppMethodInfo.cpplineindex); // _lineIndex
w.writeln(" },");
@@ -725,6 +725,12 @@
} else {
w.writeln("0,");
}
+ // TODO - replace these 4 with real values
+ w.writeln("0,");
+ w.writeln("0,");
+ w.writeln("0,");
+ w.writeln("0,");
+
w.writeln("_X10strings,");
if (!m.isEmpty()) {
w.writeln("_X10sourceList,");
@@ -740,6 +746,13 @@
} else {
w.write("NULL,");
}
+
+ // TODO - replace these 4 with real values
+ w.writeln("NULL,");
+ w.writeln("NULL,");
+ w.writeln("NULL,");
+ w.writeln("NULL,");
+
w.end(); w.newline();
w.writeln("};");
}
Modified: trunk/x10.runtime/src-cpp/x10aux/debug.h
===================================================================
--- trunk/x10.runtime/src-cpp/x10aux/debug.h 2010-09-23 13:42:39 UTC (rev 16657)
+++ trunk/x10.runtime/src-cpp/x10aux/debug.h 2010-09-23 14:25:12 UTC (rev 16658)
@@ -84,10 +84,10 @@
uint32_t _x10class; // Index of the X10 containing class name in _X10strings
uint32_t _x10method; // Index of the X10 method name in _X10strings
uint32_t _x10returnType; // Index of the X10 return type in _X10strings
+ uint32_t _cppClass; // Index of the C++ class name in _X10strings
uint64_t _x10args; // A pointer to a string that contains binary encodings of the
// argument indices. Each group of 4 bytes represents the index
// of the corresponding argument in _X10strings
- uint32_t _cppClass; // Index of the C++ class name in _X10strings
uint16_t _x10argCount; // The number of X10 arguments
uint16_t _lineIndex; // Index into _CPPtoX10xrefList of the first line of the method
};
@@ -95,10 +95,12 @@
struct _X10LocalVarMap
{
uint32_t _x10name; // Index of the X10 variable name in _X10strings
- uint32_t _x10type; // Index of the X10 type in _X10strings
+ uint32_t _x10type; // Classification of this type
+ uint32_t _x10typeIndex; // Index of the X10 type into appropriate _X10ClassMap, _X10ClosureMap (if applicable)
uint32_t _cppName; // Index of the C++ variable name in _X10strings
- uint32_t _startLineIndex; // Index into _CPPtoX10xrefList of the line where the variable is created
- uint32_t _endLineIndex; // Index into _CPPtoX10xrefList of the last line where the variable is still in scope
+ uint32_t _x10index; // Index of X10 file name in _X10sourceList
+ uint32_t _x10startLine; // First line number of X10 line range
+ uint32_t _x10endLine; // Last line number of X10 line range
};
// The _X10TypeMap and extenders of it are used in the member variable mappings
@@ -108,26 +110,42 @@
// The details of the type follow..
};
-struct _X10TypeMember : public _X10TypeMap
+struct _X10TypeMember
{
- uint32_t _x10MemberName; // Index of the X10 member name in _X10strings
- uint32_t _x10MemberOffset; // Offset of the member within the X10 class
+ uint32_t _x10Type; // Classification of this type
+ uint32_t _x10typeIndex; // Index of the X10 type into appropriate _X10typeMap
+ uint32_t _x10memberName; // Index of the X10 member name in _X10strings
+ uint32_t _cppMemberName; // Index of the C++ member name in _X10strings
+ uint32_t _cppClass; // Index of the C++ containing struct/class name in _X10strings
};
-struct _X10ClassMap : public _X10TypeMap
+struct _X10ClassMap
{
+ uint32_t _x10type; // Classification of this type
uint32_t _x10name; // Index of the X10 class type name in _X10 strings
- uint32_t _x10ClassSize; // number of bytes in the class
- uint32_t _x10ClassMemberCount; // number of members in the class
- _X10TypeMember* _x10members; // pointer to an array of individual member types
+ uint32_t _x10size; // number of bytes in the class
+ uint32_t _x10memberCount; // number of members in the class
+ const struct _X10TypeMember* _x10members; // pointer to an array of individual member types
};
-struct _X10ClosureMap : public _X10ClassMap
+struct _X10ClosureMap
{
- uint32_t _x10StartLine; // the start line of the closure definition in the X10 source
- uint32_t _x10EndLine; // the end line of the closure definition in the X10 source
+ uint32_t _x10type; // Classification of this type
+ uint32_t _x10name; // Index of the X10 class type name in _X10 strings
+ uint32_t _x10size; // number of bytes in the closure class
+ uint32_t _x10memberCount; // number of members in the class
+ uint32_t _x10index; // Index of X10 file name in _X10sourceList
+ uint32_t _x10startLine; // the start line of the closure definition in the X10 source
+ uint32_t _x10endLine; // the end line of the closure definition in the X10 source
+ const struct _X10TypeMember* const _x10members; // pointer to an array of individual member types
};
+struct _X10ArrayMap
+{
+ uint32_t _x10type; // Classification of this type
+ uint32_t _x10typeIndex; // Index of the X10 type into appropriate _X10typeMap (if applicable)
+};
+
struct _X10RefMap : public _X10TypeMap
{
uint32_t _x10ReferredType; // type number of the referred type
@@ -138,14 +156,7 @@
uint32_t _x10Name; // Offset to the name of the typedef in _X10strings
};
-struct _X10ArrayMap : public _X10TypeMap
-{
- uint32_t _x10ElementCount; // Number of elements in the array
- uint32_t _x10ElementType; // type number of the array elements
-};
-
-
enum _MetaLanguage {
X10_META_LANG = 0 // Metalanguage 0 is X10
};
@@ -165,18 +176,20 @@
unsigned x10toCPPlistSize; // the size in bytes of the X10->C++ cross reference
unsigned cPPtoX10xrefListSize; // the size in bytes of the C++->X10 cross reference
unsigned x10methodNameListSize; // the size in bytes of the X10 method name mapping list
-// TODO - uncomment these two lines once the compiler starts generating them.
-// unsigned x10localVarListSize; // the size in bytes of the X10 local variable name mapping list
-// unsigned x10typeListSize; // the size in bytes of the X10 type mapping list
+ unsigned x10localVarListSize; // the size in bytes of the X10 local variable name mapping list
+ unsigned x10classMapListSize; // the size in bytes of the X10 class mapping list
+ unsigned x10closureMapListSize; // the size in bytes of the X10 async closure mapping list
+ unsigned x10arrayMapListSize; // the size in bytes of the X10 array mapping list
- const char* x10strings; // The string table
- const struct _X10sourceFile* x10sourceList; // The list of X10 source files
- const struct _X10toCPPxref* x10toCPPlist; // The X10->C++ cross reference
- const struct _CPPtoX10xref* cPPtoX10xrefList; // The C++->X10 cross reference
- const struct _X10methodName* x10methodNameList; // The method name mapping list
-// TODO - uncomment these two lines once the compiler starts generating them.
-// const struct _X10LocalVarMap* x10localVarList; // The local variable name mapping list
-// const struct _X10TypeMap* x10typeList; // The type mapping list
+ const char* x10strings; // The string table
+ const struct _X10sourceFile* x10sourceList; // The list of X10 source files
+ const struct _X10toCPPxref* x10toCPPlist; // The X10->C++ cross reference
+ const struct _CPPtoX10xref* cPPtoX10xrefList; // The C++->X10 cross reference
+ const struct _X10methodName* x10methodNameList; // The method name mapping list
+ const struct _X10LocalVarMap* x10localVarList; // The local variable name mapping list
+ const struct _X10ClassMap* x10classMapList; // The class mapping list
+ const struct _X10ClosureMap* x10closureMapList; // The async closure mapping list
+ const struct _X10ArrayMap* x10arrayMapList; // The array mapping list
};
//extern void _X10_Entry_Hook(); // A hook at the start of every X10 method.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
