Skip to content

Start to implement PyType_FromSpec type approach #1196

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 13 commits into from
Closed

Start to implement PyType_FromSpec type approach #1196

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
27fb3c3
Start to implement PyType_FromSpec type approach
koubaa Aug 1, 2020
bd26014
remove unused code
koubaa Aug 1, 2020
81ba32c
always add null slot
koubaa Aug 1, 2020
44d364e
change CreateType
koubaa Aug 1, 2020
1eb7f32
add comment
koubaa Aug 1, 2020
5a2ccff
some progress & slight refactoring
koubaa Aug 2, 2020
68b9d22
implement some PR suggestions
koubaa Aug 3, 2020
71c20f2
fix memory layout
koubaa Aug 4, 2020
5a8da7b
remove static constructor
koubaa Aug 4, 2020
3587638
Use struct
koubaa Aug 7, 2020
79d6a66
push missed change
koubaa Aug 7, 2020
0e74e0d
rename interop slots
koubaa Aug 7, 2020
6333888
re-add commented block
koubaa Aug 8, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
implement some PR suggestions
  • Loading branch information
@koubaa
koubaa committed Aug 3, 2020
commit 68b9d22dc9fb7f94c481cd10af5d7b18b164cc8e
39 changes: 21 additions & 18 deletions src/runtime/typemanager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -434,7 +434,7 @@ internal static IntPtr BasicSubType(string name, IntPtr base_, Type impl)
return type;
}

enum TypeSlots
internal enum TypeSlots : long
{
bf_getbuffer = 1,
bf_releasebuffer = 2,
Expand Down Expand Up @@ -526,8 +526,8 @@ private static int getSlotNumber(string methodName)
[StructLayout(LayoutKind.Sequential)]
internal struct PY_TYPE_SLOT
{
public long slot; //slot id, from typeslots.h
public IntPtr func; //function pointer of the function implementing the slot
internal TypeSlots slot; //slot id, from typeslots.h
internal IntPtr func; //function pointer of the function implementing the slot
}

[StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi)]
Expand All @@ -554,27 +554,30 @@ public static IntPtr AllocPyTypeSpec(string typename, int obSize, int obFlags, I
//amount of space needed is the length of the string and the null terminator
//char* name member will simply point to the position of the buffer.
int size = name_value + ascii.Length + 1;
IntPtr ptr = Marshal.AllocHGlobal(size);
IntPtr specPtr = Marshal.AllocHGlobal(size);

Marshal.Copy(ascii, 0, ptr + name_value, ascii.Length);
Marshal.WriteIntPtr(ptr, name, ptr + name_value);
Marshal.WriteByte(ptr, name + ascii.Length, 0);
Marshal.Copy(ascii, 0, specPtr + name_value, ascii.Length);
Marshal.WriteIntPtr(specPtr, name, specPtr + name_value);
Marshal.WriteByte(specPtr, name + ascii.Length, 0);

Util.WriteCLong(ptr, basicsize, obSize);
Util.WriteCLong(ptr, itemsize, 0);
Util.WriteCLong(ptr, flags, obFlags);
Marshal.WriteInt32(specPtr, basicsize, obSize);
Marshal.WriteInt32(specPtr, itemsize, 0);
Marshal.WriteInt32(specPtr, flags, obSize);
//Util.WriteCLong(specPtr, basicsize, obFlags);
//Util.WriteCLong(specPtr, itemsize, 0);
//Util.WriteCLong(specPtr, flags, obFlags);

Marshal.WriteIntPtr(ptr, slots, slotsPtr);
return ptr;
Marshal.WriteIntPtr(specPtr, slots, slotsPtr);
return specPtr;
}

public static int name = 0;
public static int basicsize = 0;
public static int itemsize = 0;
public static int flags = 0;
public static int slots = 0;
public static int name = 16;
public static int basicsize = 24;
public static int itemsize = 28;
public static int flags = 32;
public static int slots = 36;

private static int name_value = 0;
public static int name_value = 44;
}


Expand Down