Changeset 299

Timestamp:

06/02/10 13:53:08 (2 years ago)

Author:

sean

Message:

Added @property where appropriate in core routines (haven't checked core.sync yet).
NOTE: This requires a beta DMD 2.047 compiler to produce working headers.

Added 'get' properties as approproate in core.runtime.

Added some initial header support for stack tracing in Windows.

Files:

• trunk/import/core/sys/windows/windows.d (modified) (2 diffs)
• trunk/src/core/runtime.d (modified) (6 diffs)
• trunk/src/core/thread.d (modified) (8 diffs)
• trunk/src/rt/lifetime.d (modified) (1 diff)

trunk/import/core/sys/windows/windows.d

@@ -52 +52 @@
-
-    alias uint DWORD;
+    alias ulong DWORD64;
-    alias int BOOL;
-    alias ubyte BYTE;
@@ -1176 +1177 @@
-}
-
+enum ADDRESS_MODE
+{
+    AddrMode1616,
+    AddrMode1632,
+    AddrModeReal,
+    AddrModeFlat
+}
+
+struct ADDRESS
+{
+    DWORD         Offset;
+    WORD          Segment;
+    ADDRESS_MODE  Mode;
+}
+
+struct ADDRESS64
+{
+    DWORD64       Offset;
+    WORD          Segment;
+    ADDRESS_MODE  Mode;
+}
+
+struct KDHELP
+{
+    DWORD       Thread;
+    DWORD       ThCallbackStack;
+    DWORD       NextCallback;
+    DWORD       FramePointer;
+    DWORD       KiCallUserMode;
+    DWORD       KeUserCallbackDispatcher;
+    DWORD       SystemRangeStart;
+    DWORD       ThCallbackBStore;
+    DWORD       KiUserExceptionDispatcher;
+    DWORD       StackBase;
+    DWORD       StackLimit;
+    DWORD[5]    Reserved;
+}
+
+struct KDHELP64
+{
+    DWORD64     Thread;
+    DWORD       ThCallbackStack;
+    DWORD       ThCallbackBStore;
+    DWORD       NextCallback;
+    DWORD       FramePointer;
+    DWORD64     KiCallUserMode;
+    DWORD64     KeUserCallbackDispatcher;
+    DWORD64     SystemRangeStart;
+    DWORD64     KiUserExceptionDispatcher;
+    DWORD64     StackBase;
+    DWORD64     StackLimit;
+    DWORD64[5]  Reserved;
+}
+
+struct STACKFRAME
+{
+    ADDRESS     AddrPC;
+    ADDRESS     AddrReturn;
+    ADDRESS     AddrFrame;
+    ADDRESS     AddrStack;
+    PVOID       FuncTableEntry;
+    DWORD[4]    Params;
+    BOOL        Far;
+    BOOL        Virtual;
+    DWORD[3]    Reserved;
+    KDHELP      KdHelp;
+    ADDRESS     AddrBStore;
+}
+
+struct STACKFRAME64
+{
+    ADDRESS64   AddrPC;
+    ADDRESS64   AddrReturn;
+    ADDRESS64   AddrFrame;
+    ADDRESS64   AddrStack;
+    ADDRESS64   AddrBStore;
+    PVOID       FuncTableEntry;
+    DWORD64[4]  Params;
+    BOOL        Far;
+    BOOL        Virtual;
+    DWORD64[3]  Reserved;
+    KDHELP64    KdHelp;
+}
+
-enum
-{

trunk/src/core/runtime.d

@@ -23 +23 @@
-
-    extern (C) void rt_setCollectHandler( CollectHandler h );
+    extern (C) CollectHandler rt_getCollectHandler();
+
-    extern (C) void rt_setTraceHandler( TraceHandler h );
-    extern (C) TraceHandler rt_getTraceHandler();
@@ -121 +123 @@
-     *  true if the runtime is halting.
-     */
-
+@property 
-    {
-        return rt_isHalting();
@@ -169 +171 @@
-     *  h = The new trace handler.  Set to null to use the default handler.
-     */
-
+@property 
-    {
-        rt_setTraceHandler( h );
@@ -175 +177 @@
-
-    /**
-
-
-
+
+
+
+
+
+
-    {
-        return rt_getTraceHandler();
@@ -193 +198 @@
-     *  h = The new collect handler.  Set to null to use the default handler.
-     */
-
+@property 
-    {
-        rt_setCollectHandler( h );
+    }
+    
+    
+    /**
+     * Gets the current collect handler.
+     *
+     * Returns:
+     *  The current collect handler or null if no trace handler is set.
+     */
+    static @property CollectHandler collectHandler()
+    {
+        return rt_getCollectHandler();
-    }
-
@@ -208 +225 @@
-     *  h = The new unit tester.  Set to null to use the default unit tester.
-     */
-
+@property 
-    {
-        sm_moduleUnitTester = h;
+    }
+    
+    
+    /**
+     * Gets the current module unit tester.
+     *
+     * Returns:
+     *  The current module unit tester handler or null if no trace handler is
+     *  set.
+     */
+    static @property ModuleUnitTester moduleUnitTester()
+    {
+        return sm_moduleUnitTester;
-    }
-

trunk/src/core/thread.d

@@ -793 +793 @@
-     *  The name of this thread.
-     */
-
+@property 
-    {
-        synchronized( this )
@@ -808 +808 @@
-     *  val = The new name of this thread.
-     */
-
+@property 
-    {
-        synchronized( this )
@@ -827 +827 @@
-     *  true if this is a daemon thread.
-     */
-
+@property 
-    {
-        synchronized( this )
@@ -846 +846 @@
-     *  val = The new daemon status for this thread.
-     */
-
+@property 
-    {
-        synchronized( this )
@@ -861 +861 @@
-     *  true if the thread is running, false if not.
-     */
-
+@property 
-    {
-        if( m_addr == m_addr.init )
@@ -913 +913 @@
-     *  The scheduling priority of this thread.
-     */
-
+@property 
-    {
-        version( Windows )
@@ -937 +937 @@
-     *  val = The new scheduling priority of this thread.
-     */
-
+@property 
-    {
-        version( Windows )
@@ -2934 +2934 @@
-     *  The state of this fiber as an enumerated value.
-     */
-
+@property 
-    {
-        return m_state;

trunk/src/rt/lifetime.d

@@ -942 +942 @@
- *
- */
- 
+
-{
-    collectHandler = h;
+}
+
+
+/**
+ *
+ */
+extern (C) CollectHandler rt_getCollectHandler()
+{
+    return collectHandler;
-}
-