Check-in [ed840e0c6b]

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Correct types to be the boxed types.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: ed840e0c6b2c2c6ba433849cde36aea74fd04036
User & Date: stephanie.gawroriski 2019-11-30 21:38:48
Context
2019-12-01
08:02
Backup developer notes. check-in: 1e7d0af871 user: squirreljme tags: trunk, x-date-201912
2019-11-30
21:38
Correct types to be the boxed types. check-in: ed840e0c6b user: stephanie.gawroriski tags: trunk
21:36
Use forwarded entries when decoding class names. check-in: ff27d4c1fa user: stephanie.gawroriski tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to runt/klib/supervisor/cc/squirreljme/jvm/lib/ClassInfoUtility.java.

85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
...
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
			int pdx;
			
			// Depends on the field name and type
			String nat = cifs.name(cif) + ":" + cifs.type(cif);
			switch (nat)
			{
				// Self pointer.
				case "selfptr:I":
					pdx = ClassInfoProperty.INT_SELFPTR;
					break;

				// Magic number used to detect corruption.
				case "magic:I":
					pdx = ClassInfoProperty.INT_MAGIC;
					break;

				// Class information flags.
				case "flags:I":
					pdx = ClassInfoProperty.INT_FLAGS;
					break;

				// The pointer to the minimized class file.
				case "miniptr:I":
					pdx = ClassInfoProperty.INT_MINIPTR;
					break;

				// The pointer to the class name.
				case "namep:I":
					pdx = ClassInfoProperty.INT_NAMEP;
					break;

				// The allocation size of this class.
				case "size:I":
					pdx = ClassInfoProperty.INT_SIZE;
					break;

				// The base offset for fields in this class.
				case "base:I":
					pdx = ClassInfoProperty.INT_BASE;
					break;

				// The number of objects in the instance fields, for GC.
				case "numobjects:I":
					pdx = ClassInfoProperty.INT_NUMOBJECTS;
					break;

				// The dimensions this class uses, if it is an array.
				case "dimensions:I":
					pdx = ClassInfoProperty.INT_DIMENSIONS;
					break;

				// The cell size of components if this is an array.
				case "cellsize:I":
					pdx = ClassInfoProperty.INT_CELLSIZE;
					break;

				// The super class data.
				case "superclass:cc/squirreljme/jvm/ClassInfo":
					pdx = ClassInfoProperty.CLASSINFO_SUPERCLASS;
					break;
................................................................................

				// Virtual invoke VTable pool entries.
				case "vtablepool:[I":
					pdx = ClassInfoProperty.INT_ARRAY_VTABLEPOOL;
					break;

				// The pointer to the constant pool of this class.
				case "pool:I":
					pdx = ClassInfoProperty.INT_POOL;
					break;
				
				default:
					throw new todo.TODO(nat);
			}
			







|




|




|




|




|




|




|




|




|




|







 







|







85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
...
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
			int pdx;
			
			// Depends on the field name and type
			String nat = cifs.name(cif) + ":" + cifs.type(cif);
			switch (nat)
			{
				// Self pointer.
				case "selfptr:int":
					pdx = ClassInfoProperty.INT_SELFPTR;
					break;

				// Magic number used to detect corruption.
				case "magic:int":
					pdx = ClassInfoProperty.INT_MAGIC;
					break;

				// Class information flags.
				case "flags:int":
					pdx = ClassInfoProperty.INT_FLAGS;
					break;

				// The pointer to the minimized class file.
				case "miniptr:int":
					pdx = ClassInfoProperty.INT_MINIPTR;
					break;

				// The pointer to the class name.
				case "namep:int":
					pdx = ClassInfoProperty.INT_NAMEP;
					break;

				// The allocation size of this class.
				case "size:int":
					pdx = ClassInfoProperty.INT_SIZE;
					break;

				// The base offset for fields in this class.
				case "base:int":
					pdx = ClassInfoProperty.INT_BASE;
					break;

				// The number of objects in the instance fields, for GC.
				case "numobjects:int":
					pdx = ClassInfoProperty.INT_NUMOBJECTS;
					break;

				// The dimensions this class uses, if it is an array.
				case "dimensions:int":
					pdx = ClassInfoProperty.INT_DIMENSIONS;
					break;

				// The cell size of components if this is an array.
				case "cellsize:int":
					pdx = ClassInfoProperty.INT_CELLSIZE;
					break;

				// The super class data.
				case "superclass:cc/squirreljme/jvm/ClassInfo":
					pdx = ClassInfoProperty.CLASSINFO_SUPERCLASS;
					break;
................................................................................

				// Virtual invoke VTable pool entries.
				case "vtablepool:[I":
					pdx = ClassInfoProperty.INT_ARRAY_VTABLEPOOL;
					break;

				// The pointer to the constant pool of this class.
				case "pool:int":
					pdx = ClassInfoProperty.INT_POOL;
					break;
				
				default:
					throw new todo.TODO(nat);
			}