Attachment #1521 for bug #1594

View | Details | Raw Unified | Return to bug 1594
Collapse All | Expand All

(-)a/.hgignore (+1 lines)

Lines 4-6	Link Here

^objdir/

^objdir/

^poub

^poub

^net-next

^net-next

\.gcno$

(-)a/Makefile (-3 / +8 lines)

Lines 13-18	Link Here

proc.c seq.c socket.c tasklet-hrtimer.c \

proc.c seq.c socket.c tasklet-hrtimer.c \

cred.c pid.c modules.c

cred.c pid.c modules.c

COV?=no

cov_yes=-fprofile-arcs -ftest-coverage

cov_no=

covl_yes=-fprofile-arcs

covl_no=

OPT?=no

OPT?=no

opt_yes=-O3 -fomit-frame-pointer

opt_yes=-O3 -fomit-frame-pointer

Lines 32-38	Link Here

 -include autoconf.h \

 -include autoconf.h \

 -U__FreeBSD__ -D__linux__=1 -Dlinux=1 -D__linux=1 \

 -U__FreeBSD__ -D__linux__=1 -Dlinux=1 -D__linux=1 \

 -I$(SRCDIR)sim/include -I$(SRCDIR)$(KERNEL_DIR)/include \

 -I$(SRCDIR)sim/include -I$(SRCDIR)$(KERNEL_DIR)/include \

 $(PIC_CFLAGS) -D_DEBUG -I$(PWD)

 $(PIC_CFLAGS) -D_DEBUG -I$(PWD) $(cov_$(COV))

include $(SRCDIR)processor.mk

include $(SRCDIR)processor.mk

Lines 40-46	Link Here

CFLAGS+= -DCONFIG_64BIT

CFLAGS+= -DCONFIG_64BIT

endif

endif

LDFLAGS += -shared -nostdlib -g3 -Wl,-O1 -Wl,-Tlinker.lds

LDFLAGS += -shared -nodefaultlibs -g3 -Wl,-O1 -Wl,-Tlinker.lds $(covl_$(COV))

modules:=

modules:=

all-obj-for-clean:=

all-obj-for-clean:=

Lines 146-149	Link Here

146

menuconfig:

151

menuconfig:

147

	$(MAKE) -C $(KERNEL_DIR) ARCH=sim menuconfig

152

	$(MAKE) -C $(KERNEL_DIR) ARCH=sim menuconfig

148

153

149

.PHONY : clean

154

.PHONY : clean




#include <stdarg.h>
#include <linux/types.h>
#include <linux/socket.h>
#include <stdio.h>
#include "sim-types.h"

#ifdef __cplusplus

  void (*free) (struct SimKernel *kernel, void *buffer);
  void *(*memcpy) (struct SimKernel *kernel, void *dst, const void *src, unsigned long size);
  void *(*memset) (struct SimKernel *kernel, void *dst, char value, unsigned long size);
  int (*atexit) (struct SimKernel *kernel, void (*function)(void));
  int (*access) (struct SimKernel *kernel, const char *pathname, int mode);
  char *(*getenv) (struct SimKernel *kernel, const char *name);
  int (*mkdir)(struct SimKernel *kernel, const char *pathname, mode_t mode);
  int (*open)(struct SimKernel *kernel, const char *pathname, int flags);
  int (*__fxstat) (struct SimKernel *kernel, int ver, int fd, void *buf);
  int (*fseek)(struct SimKernel *kernel, FILE *stream, long offset, int whence);
  void (*setbuf)(struct SimKernel *kernel, FILE *stream, char *buf);
  FILE *(*fdopen)(struct SimKernel *kernel, int fd, const char *mode);
  long (*ftell)(struct SimKernel *kernel, FILE *stream);
  int (*fclose)(struct SimKernel *kernel, FILE *fp);
  size_t (*fread)(struct SimKernel *kernel, void *ptr, size_t size, size_t nmemb, FILE *stream);
  size_t (*fwrite)(struct SimKernel *kernel, const void *ptr, size_t size, size_t nmemb, FILE *stream);

  unsigned long (*random) (struct SimKernel *kernel);
  void *(*event_schedule_ns) (struct SimKernel *kernel, __u64 ns, void (*fn) (void *context), void *context,
			      void (*pre_fn) (void));

(-)a/sim/modules.c (-1 / +1 lines)

Lines 14-19	Link Here

int __request_module(bool wait, const char *fmt, ...)

int __request_module(bool wait, const char *fmt, ...)

  // we really should never be trying to load modules that way.

  // we really should never be trying to load modules that way.

  sim_assert (false);

  // sim_assert (false);

  return 0;

  return 0;

(-)a/sim/proc.c (+4 lines)

Lines 33-38	Link Here

  // insert new entry at head of subdir list in parent

  // insert new entry at head of subdir list in parent

  struct proc_dir_entry * child = kzalloc (sizeof(struct proc_dir_entry), GFP_KERNEL);

  struct proc_dir_entry * child = kzalloc (sizeof(struct proc_dir_entry), GFP_KERNEL);

  if (!child)

      return NULL;

  child->name = kstrdup (name, GFP_KERNEL);

  child->name = kstrdup (name, GFP_KERNEL);

  child->namelen = strlen (name);

  child->namelen = strlen (name);

  child->parent = parent;

  child->parent = parent;




struct SimTask *sim_task_create (void *private, unsigned long pid)
{
  struct SimTask *task = sim_malloc (sizeof (struct SimTask));
  if (!task) return NULL;
  struct cred *cred = sim_malloc (sizeof (struct cred));
  if (!cred) return NULL;
  // XXX: we could optimize away this allocation by sharing it for all tasks
  struct nsproxy *ns = sim_malloc (sizeof (struct nsproxy));
  if (!ns) return NULL;
  struct user_struct *user = sim_malloc (sizeof (struct user_struct));
  if (!user) return NULL;
  struct thread_info *info = alloc_thread_info (&task->kernel_task);
  if (!info) return NULL;
  struct pid *kpid = sim_malloc (sizeof (struct pid));
  if (!kpid) return NULL;
  kpid->numbers[0].nr = pid;
  user->user_ns = 0;
  cred->fsuid = 0;

(-)a/sim/sim-socket.c (+10 lines)

Lines 16-21	Link Here

  int size = sizeof (struct iovec) * len;

  int size = sizeof (struct iovec) * len;

  struct iovec *output = sim_malloc (size);

  struct iovec *output = sim_malloc (size);

  if (!output)

    return NULL;

  sim_memcpy (output, input, size);

  sim_memcpy (output, input, size);

  return output;

  return output;

Lines 189-194	Link Here

189

191

190

  struct socket *sock = (struct socket *)socket;

192

  struct socket *sock = (struct socket *)socket;

191

  wait_queue_t *wait = ( wait_queue_t * ) sim_malloc (sizeof(wait_queue_t));

193

  wait_queue_t *wait = ( wait_queue_t * ) sim_malloc (sizeof(wait_queue_t));

194

  if (!wait)

195

    return NULL;

192

196

193

  wait->func = sim_wake_function;

197

  wait->func = sim_wake_function;

194

  wait->private = context;

198

  wait->private = context;

Lines 298-303	Link Here

298

      ( struct sim_ptable_entry * ) sim_malloc (sizeof(struct sim_ptable_entry));

302

      ( struct sim_ptable_entry * ) sim_malloc (sizeof(struct sim_ptable_entry));

299

  struct poll_table_ref *fromDCE =  (struct poll_table_ref *) pwq->table;

303

  struct poll_table_ref *fromDCE =  (struct poll_table_ref *) pwq->table;

300

304

305

  if (!entry)

306

    return;

307

301

  entry->opaque = fromDCE->opaque; // Copy DCE poll table reference

308

  entry->opaque = fromDCE->opaque; // Copy DCE poll table reference

302

  entry->eventMask = fromDCE->ret; // Copy poll mask of wanted events.

309

  entry->eventMask = fromDCE->ret; // Copy poll mask of wanted events.

303

310

Lines 333-338	Link Here

333

  if ( ret->opaque )

340

  if ( ret->opaque )

334

341

335

      ptable = (struct poll_wqueues *)sim_malloc (sizeof(struct poll_wqueues));

342

      ptable = (struct poll_wqueues *)sim_malloc (sizeof(struct poll_wqueues));

343

      if (!ptable)

344

        return;

345

336

      dce_poll_initwait(ptable);

346

      dce_poll_initwait(ptable);

337

347

338

      pwait = &(ptable->pt);

348

      pwait = &(ptable->pt);

(-)a/sim/sim.c (+86 lines)

Lines 1-6	Link Here

#include <linux/init.h> // initcall_t

#include <linux/init.h> // initcall_t

#include <linux/kernel.h> // SYSTEM_BOOTING

#include <linux/kernel.h> // SYSTEM_BOOTING

#include <linux/sched.h> // struct task_struct

#include <linux/sched.h> // struct task_struct

#include <stdio.h>

#include "sim-init.h"

#include "sim-init.h"

#include "sim.h"

#include "sim.h"

Lines 113-118	Link Here

113

114

static struct SimKernel *g_kernel;

115

static struct SimKernel *g_kernel;

115

116

117

118

static int num_handler = 0;

119

void *atexit_list[1024];

120

116

void sim_init (struct SimExported *exported, const struct SimImported *imported, struct SimKernel *kernel)

121

void sim_init (struct SimExported *exported, const struct SimImported *imported, struct SimKernel *kernel)

117

122

118

  // make sure we can call the callbacks

123

  // make sure we can call the callbacks

Lines 172-177	Link Here

172

177

173

  // finally, put the system in RUNNING state.

178

  // finally, put the system in RUNNING state.

174

  system_state = SYSTEM_RUNNING;

179

  system_state = SYSTEM_RUNNING;

180

181

  /* XXX handle atexit registration for gcov */

182

  int i;

183

  for (i = 0; i < 1024; i++)

184

185

      if (atexit_list [i])

186

        g_imported.atexit (g_kernel, (void (*)(void))atexit_list[i]);

187

188

175

189

176

190

177

191

Lines 195-200	Link Here

195

209

196

  return g_imported.memset (g_kernel, dst, value, size);

210

  return g_imported.memset (g_kernel, dst, value, size);

197

211

212

int atexit (void (*function)(void))

213

214

  if (g_imported.atexit == 0)

215

216

      atexit_list[num_handler++] = function;

217

      return 0;

218

219

  else

220

221

      return g_imported.atexit (g_kernel, function);

222

223

224

int access (const char *pathname, int mode)

225

226

  return g_imported.access (g_kernel, pathname, mode);

227

228

char *getenv (const char *name)

229

230

  return g_imported.getenv (g_kernel, name);

231

232

pid_t getpid(void)

233

234

  return (pid_t)0;

235

236

int mkdir(const char *pathname, mode_t mode)

237

238

  return g_imported.mkdir (g_kernel, pathname, mode);

239

240

int open(const char *pathname, int flags)

241

242

  return g_imported.open (g_kernel, pathname, flags);

243

244

int fcntl(int fd, int cmd, ... /* arg */ )

245

246

  return 0;

247

248

int __fxstat (int ver, int fd, void *buf)

249

250

  return g_imported.__fxstat (g_kernel, ver, fd, buf);

251

252

int fseek(FILE *stream, long offset, int whence)

253

254

  return g_imported.fseek (g_kernel, stream, offset, whence);

255

256

long ftell(FILE *stream)

257

258

  return g_imported.ftell (g_kernel, stream);

259

260

void setbuf(FILE *stream, char *buf)

261

262

  return g_imported.setbuf (g_kernel, stream, buf);

263

264

FILE *fdopen(int fd, const char *mode)

265

266

  return g_imported.fdopen (g_kernel, fd, mode);

267

268

size_t fread(void *ptr, size_t size, size_t nmemb, FILE *stream)

269

270

  return g_imported.fread (g_kernel, ptr, size, nmemb, stream);

271

272

size_t fwrite(const void *ptr, size_t size, size_t nmemb, FILE *stream)

273

274

  return g_imported.fwrite (g_kernel, ptr, size, nmemb, stream);

275

276

int fclose(FILE *fp)

277

278

  return g_imported.fclose (g_kernel, fp);

279

198

unsigned long sim_random (void)

280

unsigned long sim_random (void)

199

281

200

  return g_imported.random (g_kernel);

282

  return g_imported.random (g_kernel);

Lines 230-235	Link Here

230

struct SimTask *sim_task_start (void (*callback) (void *), void *context)

312

struct SimTask *sim_task_start (void (*callback) (void *), void *context)

231

313

232

  struct SimTaskTrampolineContext *ctx = sim_malloc (sizeof (struct SimTaskTrampolineContext));

314

  struct SimTaskTrampolineContext *ctx = sim_malloc (sizeof (struct SimTaskTrampolineContext));

315

  if (!ctx)

316

317

      return NULL;

318

233

  ctx->callback = callback;

319

  ctx->callback = callback;

234

  ctx->context = context;

320

  ctx->context = context;

235

  return g_imported.task_start (g_kernel, &sim_task_start_trampoline, ctx);

321

  return g_imported.task_start (g_kernel, &sim_task_start_trampoline, ctx);

(-)a/sim/slab.c (+8 lines)

Lines 22-27	Link Here

void *__kmalloc(size_t size, gfp_t flags)

void *__kmalloc(size_t size, gfp_t flags)

  void *p = sim_malloc (size + sizeof (size));

  void *p = sim_malloc (size + sizeof (size));

  if (!p)

      return NULL;

  if (p != 0 && (flags & __GFP_ZERO))

  if (p != 0 && (flags & __GFP_ZERO))

Lines 54-59	Link Here

		  unsigned long flags, void (*ctor)(void *))

		  unsigned long flags, void (*ctor)(void *))

  struct kmem_cache *cache = kmalloc (sizeof (struct kmem_cache), flags);

  struct kmem_cache *cache = kmalloc (sizeof (struct kmem_cache), flags);

  if (!cache)

      return NULL;

  cache->name = name;

  cache->name = name;

  cache->size = size;

  cache->size = size;

  cache->align = align;

  cache->align = align;

Return to bug 1594